Skip to content

Commit dbf1efb

Browse files
committed
Merge pull request #97442 from dustdfg/disable_xr/missing_disable_3d_ifndefs
Add missing `#ifndef _3D_DISABLED` to main file
2 parents bfe74ec + 4156077 commit dbf1efb

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

main/main.cpp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -612,7 +612,9 @@ void Main::print_help(const char *p_binary) {
612612
print_help_option("--position <X>,<Y>", "Request window position.\n");
613613
print_help_option("--screen <N>", "Request window screen.\n");
614614
print_help_option("--single-window", "Use a single window (no separate subwindows).\n");
615+
#ifndef _3D_DISABLED
615616
print_help_option("--xr-mode <mode>", "Select XR (Extended Reality) mode [\"default\", \"off\", \"on\"].\n");
617+
#endif
616618

617619
print_help_title("Debug options");
618620
print_help_option("-d, --debug", "Debug (local stdout debugger).\n");
@@ -2571,6 +2573,7 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
25712573
GLOBAL_DEF("display/window/ios/hide_status_bar", true);
25722574
GLOBAL_DEF("display/window/ios/suppress_ui_gesture", true);
25732575

2576+
#ifndef _3D_DISABLED
25742577
// XR project settings.
25752578
GLOBAL_DEF_RST_BASIC("xr/openxr/enabled", false);
25762579
GLOBAL_DEF_BASIC(PropertyInfo(Variant::STRING, "xr/openxr/default_action_map", PROPERTY_HINT_FILE, "*.tres"), "res://openxr_action_map.tres");
@@ -2599,7 +2602,8 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
25992602
// editor settings (it seems we're too early in the process when setting up rendering, to access editor settings...)
26002603
// EDITOR_DEF_RST("xr/openxr/in_editor", false);
26012604
// GLOBAL_DEF("xr/openxr/in_editor", false);
2602-
#endif
2605+
#endif // TOOLS_ENABLED
2606+
#endif // _3D_DISABLED
26032607

26042608
Engine::get_singleton()->set_frame_delay(frame_delay);
26052609

0 commit comments

Comments
 (0)