2
0
Эх сурвалжийг харах

Merge pull request #103778 from darksylinc/matias-xr-disabled-fix

Fix build errors when building with `disable_xr=yes`
Thaddeus Crews 6 сар өмнө
parent
commit
629b6767e6

+ 2 - 0
scene/register_scene_types.cpp

@@ -293,10 +293,12 @@
 #include "scene/3d/visible_on_screen_notifier_3d.h"
 #include "scene/3d/visible_on_screen_notifier_3d.h"
 #include "scene/3d/voxel_gi.h"
 #include "scene/3d/voxel_gi.h"
 #include "scene/3d/world_environment.h"
 #include "scene/3d/world_environment.h"
+#ifndef XR_DISABLED
 #include "scene/3d/xr/xr_body_modifier_3d.h"
 #include "scene/3d/xr/xr_body_modifier_3d.h"
 #include "scene/3d/xr/xr_face_modifier_3d.h"
 #include "scene/3d/xr/xr_face_modifier_3d.h"
 #include "scene/3d/xr/xr_hand_modifier_3d.h"
 #include "scene/3d/xr/xr_hand_modifier_3d.h"
 #include "scene/3d/xr/xr_nodes.h"
 #include "scene/3d/xr/xr_nodes.h"
+#endif // XR_DISABLED
 #include "scene/animation/root_motion_view.h"
 #include "scene/animation/root_motion_view.h"
 #include "scene/resources/3d/box_shape_3d.h"
 #include "scene/resources/3d/box_shape_3d.h"
 #include "scene/resources/3d/capsule_shape_3d.h"
 #include "scene/resources/3d/capsule_shape_3d.h"

+ 2 - 0
servers/register_server_types.cpp

@@ -91,6 +91,7 @@
 #include "physics_server_3d.h"
 #include "physics_server_3d.h"
 #include "physics_server_3d_dummy.h"
 #include "physics_server_3d_dummy.h"
 #include "servers/extensions/physics_server_3d_extension.h"
 #include "servers/extensions/physics_server_3d_extension.h"
+#ifndef XR_DISABLED
 #include "xr/xr_body_tracker.h"
 #include "xr/xr_body_tracker.h"
 #include "xr/xr_controller_tracker.h"
 #include "xr/xr_controller_tracker.h"
 #include "xr/xr_face_tracker.h"
 #include "xr/xr_face_tracker.h"
@@ -99,6 +100,7 @@
 #include "xr/xr_interface_extension.h"
 #include "xr/xr_interface_extension.h"
 #include "xr/xr_positional_tracker.h"
 #include "xr/xr_positional_tracker.h"
 #include "xr_server.h"
 #include "xr_server.h"
+#endif // XR_DISABLED
 #endif // _3D_DISABLED
 #endif // _3D_DISABLED
 
 
 ShaderTypes *shader_types = nullptr;
 ShaderTypes *shader_types = nullptr;