diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-04-04 14:26:28 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-04 14:26:28 +0200 |
| commit | 338b23d57224ecd04eaff4763a7ba493ffa6cb3d (patch) | |
| tree | 6eed6f575b7f5b5c1ddd5788c8b5ea7261767e05 /modules/openxr/openxr_api.cpp | |
| parent | f1592cb3da3f8149cea72026b4ce2c61a753c25c (diff) | |
| parent | 9b7b9de0e5e8bfe49ad9e02474eb9ddd5d7dacd5 (diff) | |
Merge pull request #59513 from BastiaanOlij/openxr_actionmap_editor
Diffstat (limited to 'modules/openxr/openxr_api.cpp')
| -rw-r--r-- | modules/openxr/openxr_api.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/modules/openxr/openxr_api.cpp b/modules/openxr/openxr_api.cpp index 7752878d82..e92f4c2cff 100644 --- a/modules/openxr/openxr_api.cpp +++ b/modules/openxr/openxr_api.cpp @@ -48,14 +48,14 @@ #include "extensions/openxr_vulkan_extension.h" #endif -#include "modules/openxr/openxr_interface.h" +#include "openxr_interface.h" OpenXRAPI *OpenXRAPI::singleton = nullptr; -bool OpenXRAPI::openxr_is_enabled() { +bool OpenXRAPI::openxr_is_enabled(bool p_check_run_in_editor) { // @TODO we need an overrule switch so we can force enable openxr, i.e run "godot --openxr_enabled" - if (Engine::get_singleton()->is_editor_hint()) { + if (Engine::get_singleton()->is_editor_hint() && p_check_run_in_editor) { #ifdef TOOLS_ENABLED // Disabled for now, using XR inside of the editor we'll be working on during the coming months. return false; |