diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2024-04-17 10:58:28 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2024-04-17 10:58:28 +0200 |
| commit | 3cbded7bbb4ac9cc426333194153cc605e55385d (patch) | |
| tree | 4b60b2343badafc720e4d4307b72d3e99b99b467 | |
| parent | 658e97c93aa2533cb7b12f05e62dcf6864e7acbe (diff) | |
| parent | abe7ec1543db412651a9a9a3f7af2344bc08ceb1 (diff) | |
| download | redot-engine-3cbded7bbb4ac9cc426333194153cc605e55385d.tar.gz | |
Merge pull request #89760 from AThousandShips/no_3d_fix_3
Fix some build errors with `disable_3d=yes`
| -rw-r--r-- | main/main.cpp | 2 | ||||
| -rw-r--r-- | tests/test_main.cpp | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/main/main.cpp b/main/main.cpp index a1031b5385..ed74094c9e 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -697,7 +697,9 @@ Error Main::test_setup() { /** INITIALIZE SERVERS **/ register_server_types(); +#ifndef _3D_DISABLED XRServer::set_xr_mode(XRServer::XRMODE_OFF); // Skip in tests. +#endif // _3D_DISABLED initialize_modules(MODULE_INITIALIZATION_LEVEL_SERVERS); GDExtensionManager::get_singleton()->initialize_extensions(GDExtension::INITIALIZATION_LEVEL_SERVERS); diff --git a/tests/test_main.cpp b/tests/test_main.cpp index bb6837c965..56bd8739c6 100644 --- a/tests/test_main.cpp +++ b/tests/test_main.cpp @@ -100,7 +100,6 @@ #include "tests/core/variant/test_variant.h" #include "tests/core/variant/test_variant_utility.h" #include "tests/scene/test_animation.h" -#include "tests/scene/test_arraymesh.h" #include "tests/scene/test_audio_stream_wav.h" #include "tests/scene/test_bit_map.h" #include "tests/scene/test_camera_2d.h" @@ -127,6 +126,7 @@ #include "tests/test_validate_testing.h" #ifndef _3D_DISABLED +#include "tests/scene/test_arraymesh.h" #include "tests/scene/test_camera_3d.h" #include "tests/scene/test_navigation_agent_2d.h" #include "tests/scene/test_navigation_agent_3d.h" |