godotengine
/
godot
mirror of https://github.com/godotengine/godot
1
0
Fork 0
Code

Merge pull request #104978 from beicause/fix-disable-xr-compilation 

Fix compiling with `disable_xr=yes` when 3d enabled
This commit is contained in:
Thaddeus Crews 2025-04-03 16:50:21 -05:00
parent d56efcdf57 31c191ee72
commit 7f1f4e4bdc
No known key found for this signature in database
GPG Key ID: 8C6E5FEB5FC03CCC
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
main/main.cpp
View File

@ -184,9 +184,9 @@ static PhysicsServer2D *physics_server_2d = nullptr;
static PhysicsServer3DManager *physics_server_3d_manager = nullptr;
static PhysicsServer3D *physics_server_3d = nullptr;
#endif // PHYSICS_3D_DISABLED
#ifndef _3D_DISABLED
#ifndef XR_DISABLED
static XRServer *xr_server = nullptr;
#endif // _3D_DISABLED
#endif // XR_DISABLED
// We error out if setup2() doesn't turn this true
static bool _start_success = false;
@ -4919,11 +4919,11 @@ void Main::cleanup(bool p_force) {
EngineDebugger::deinitialize();
#ifndef _3D_DISABLED
#ifndef XR_DISABLED
if (xr_server) {
memdelete(xr_server);
}
#endif // _3D_DISABLED
#endif // XR_DISABLED
if (audio_server) {
audio_server->finish();