diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2024-09-12 09:25:46 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2024-09-12 09:25:46 +0200 |
| commit | 55f1ae0d417501cee75143b28c2f07c4c02f8b11 (patch) | |
| tree | b20cf655d9547c643195f3d8a7fd79c79cf349e5 /modules/openxr/openxr_api.cpp | |
| parent | 60ffa9645a29f0bb78c70045cd6d1178f01e9e47 (diff) | |
| parent | 30a63396e5c6cceaac29b1e3e90dd08775c6b9cc (diff) | |
| download | redot-engine-55f1ae0d417501cee75143b28c2f07c4c02f8b11.tar.gz | |
Merge pull request #96868 from dsnopek/android-editor-launching-xr-app-fix
Fix launching XR apps from the Android editor
Diffstat (limited to 'modules/openxr/openxr_api.cpp')
| -rw-r--r-- | modules/openxr/openxr_api.cpp | 4 |
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"); } |