From abe7ec1543db412651a9a9a3f7af2344bc08ceb1 Mon Sep 17 00:00:00 2001
From: A Thousand Ships <96648715+AThousandShips@users.noreply.github.com>
Date: Thu, 21 Mar 2024 17:51:17 +0100
Subject: [PATCH] Fix some build errors with `disable_3d=yes`

---
 main/main.cpp       | 2 ++
 tests/test_main.cpp | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/main/main.cpp b/main/main.cpp
index a1031b538564..ed74094c9ef3 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 bb6837c965df..56bd8739c6c6 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"