mirror of
https://github.com/godotengine/godot.git
synced 2025-01-06 17:37:18 +08:00
Merge pull request #89760 from AThousandShips/no_3d_fix_3
Fix some build errors with `disable_3d=yes`
This commit is contained in:
commit
3cbded7bbb
@ -697,7 +697,9 @@ Error Main::test_setup() {
|
|||||||
|
|
||||||
/** INITIALIZE SERVERS **/
|
/** INITIALIZE SERVERS **/
|
||||||
register_server_types();
|
register_server_types();
|
||||||
|
#ifndef _3D_DISABLED
|
||||||
XRServer::set_xr_mode(XRServer::XRMODE_OFF); // Skip in tests.
|
XRServer::set_xr_mode(XRServer::XRMODE_OFF); // Skip in tests.
|
||||||
|
#endif // _3D_DISABLED
|
||||||
initialize_modules(MODULE_INITIALIZATION_LEVEL_SERVERS);
|
initialize_modules(MODULE_INITIALIZATION_LEVEL_SERVERS);
|
||||||
GDExtensionManager::get_singleton()->initialize_extensions(GDExtension::INITIALIZATION_LEVEL_SERVERS);
|
GDExtensionManager::get_singleton()->initialize_extensions(GDExtension::INITIALIZATION_LEVEL_SERVERS);
|
||||||
|
|
||||||
|
@ -100,7 +100,6 @@
|
|||||||
#include "tests/core/variant/test_variant.h"
|
#include "tests/core/variant/test_variant.h"
|
||||||
#include "tests/core/variant/test_variant_utility.h"
|
#include "tests/core/variant/test_variant_utility.h"
|
||||||
#include "tests/scene/test_animation.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_audio_stream_wav.h"
|
||||||
#include "tests/scene/test_bit_map.h"
|
#include "tests/scene/test_bit_map.h"
|
||||||
#include "tests/scene/test_camera_2d.h"
|
#include "tests/scene/test_camera_2d.h"
|
||||||
@ -127,6 +126,7 @@
|
|||||||
#include "tests/test_validate_testing.h"
|
#include "tests/test_validate_testing.h"
|
||||||
|
|
||||||
#ifndef _3D_DISABLED
|
#ifndef _3D_DISABLED
|
||||||
|
#include "tests/scene/test_arraymesh.h"
|
||||||
#include "tests/scene/test_camera_3d.h"
|
#include "tests/scene/test_camera_3d.h"
|
||||||
#include "tests/scene/test_navigation_agent_2d.h"
|
#include "tests/scene/test_navigation_agent_2d.h"
|
||||||
#include "tests/scene/test_navigation_agent_3d.h"
|
#include "tests/scene/test_navigation_agent_3d.h"
|
||||||
|
Loading…
Reference in New Issue
Block a user