summaryrefslogtreecommitdiffstats
path: root/modules
diff options
context:
space:
mode:
authorDavid Snopek <dsnopek@gmail.com>2024-09-11 14:31:54 -0500
committerDavid Snopek <dsnopek@gmail.com>2024-09-11 14:31:54 -0500
commit30a63396e5c6cceaac29b1e3e90dd08775c6b9cc (patch)
treeff88bef8d20c2b9dfa17f21894de15cffaeec853 /modules
parent4788f54d9767425bf5435b1cc940885d357795c5 (diff)
downloadredot-engine-30a63396e5c6cceaac29b1e3e90dd08775c6b9cc.tar.gz
Fix launching XR apps from the Android editor
Diffstat (limited to 'modules')
-rw-r--r--modules/openxr/openxr_api.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/modules/openxr/openxr_api.cpp b/modules/openxr/openxr_api.cpp
index a19a75e722..73b6f6c1c9 100644
--- a/modules/openxr/openxr_api.cpp
+++ b/modules/openxr/openxr_api.cpp
@@ -273,7 +273,9 @@ Vector<OpenXRExtensionWrapper *> OpenXRAPI::registered_extension_wrappers;
bool OpenXRAPI::openxr_is_enabled(bool p_check_run_in_editor) {
if (XRServer::get_xr_mode() == XRServer::XRMODE_DEFAULT) {
if (Engine::get_singleton()->is_editor_hint() && p_check_run_in_editor) {
- return GLOBAL_GET("xr/openxr/enabled.editor");
+ // For now, don't start OpenXR when the editor starts up. In the future, this may change
+ // if we want to integrate more XR features into the editor experience.
+ return false;
} else {
return GLOBAL_GET("xr/openxr/enabled");
}