summaryrefslogtreecommitdiff
path: root/main/main.cpp
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <remi@verschelde.fr>2022-04-04 14:26:28 +0200
committerGitHub <noreply@github.com>2022-04-04 14:26:28 +0200
commit338b23d57224ecd04eaff4763a7ba493ffa6cb3d (patch)
tree6eed6f575b7f5b5c1ddd5788c8b5ea7261767e05 /main/main.cpp
parentf1592cb3da3f8149cea72026b4ce2c61a753c25c (diff)
parent9b7b9de0e5e8bfe49ad9e02474eb9ddd5d7dacd5 (diff)
Merge pull request #59513 from BastiaanOlij/openxr_actionmap_editor
Diffstat (limited to 'main/main.cpp')
-rw-r--r--main/main.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/main/main.cpp b/main/main.cpp
index 89b56a814e..b730f65286 100644
--- a/main/main.cpp
+++ b/main/main.cpp
@@ -1489,8 +1489,8 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
GLOBAL_DEF("input_devices/pointing/ios/touch_delay", 0.150);
// XR project settings.
- GLOBAL_DEF_BASIC("xr/openxr/enabled", false);
- GLOBAL_DEF_BASIC("xr/openxr/default_action_map", "res://default_action_map.tres");
+ GLOBAL_DEF_RST_BASIC("xr/openxr/enabled", false);
+ GLOBAL_DEF_BASIC("xr/openxr/default_action_map", "res://openxr_action_map.tres");
ProjectSettings::get_singleton()->set_custom_property_info("xr/openxr/default_action_map", PropertyInfo(Variant::STRING, "xr/openxr/default_action_map", PROPERTY_HINT_FILE, "*.tres"));
GLOBAL_DEF_BASIC("xr/openxr/form_factor", "0");