Add missing #ifndef _3D_DISABLED to main file

[dustdfg]

XR is disabled when 3D is disbled so there is no sense in setting xr specific settings and adding --xr-mode option

[akien-mga]

This should enclose the few commented out lines below which are also about XR.

[dustdfg]

I've just done force push and I've just remembered why I didn't do it before. TOOLS_ENABLED means you compile editor. Doesn't editor must to have all the features or it can be compiled without xr/3d?

[akien-mga]

It's true that the editor can't be compiled with disable_3d, so it should be equivalent either way. But semantically I think it's clearer to exclude all XR related code in this case.

[dustdfg]

There also exist the following part of the code which also have xr option inside TOOLS_ENABLED:

godot/main/main.cpp

Lines 1045 to 1059 in 0a9d8f0

	#ifdef TOOLS_ENABLED
	if (arg == "--debug" ||
	arg == "--verbose" ||
	arg == "--disable-crash-handler") {
	forwardable_cli_arguments[CLI_SCOPE_TOOL].push_back(arg);
	forwardable_cli_arguments[CLI_SCOPE_PROJECT].push_back(arg);
	}
	if (arg == "--single-window") {
	forwardable_cli_arguments[CLI_SCOPE_TOOL].push_back(arg);
	}
	if (arg == "--audio-driver" ||
	arg == "--display-driver" ||
	arg == "--rendering-method" ||
	arg == "--rendering-driver" ||
	arg == "--xr-mode") {

But I though that editor in general must contain everything and is not supposed to be built without 3d? Didn't see previous answer. So what should I do with this part (last line)?

[akien-mga]

Hm, it could be:

diff --git a/main/main.cpp b/main/main.cpp
index 75797e31de..81bf5c735d 100644
--- a/main/main.cpp
+++ b/main/main.cpp
@@ -1055,8 +1055,11 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
                if (arg == "--audio-driver" ||
                                arg == "--display-driver" ||
                                arg == "--rendering-method" ||
-                               arg == "--rendering-driver" ||
-                               arg == "--xr-mode") {
+                               arg == "--rendering-driver"
+#ifndef _3D_DISABLED
+                               || arg == "--xr-mode"
+#endif
+               ) {
                        if (N) {
                                forwardable_cli_arguments[CLI_SCOPE_TOOL].push_back(arg);
                                forwardable_cli_arguments[CLI_SCOPE_TOOL].push_back(N->get());

but that's honestly a bit ugly, for something that's indeed not necessary as you pointed out.

It doesn't matter much either way, but I'd say in this case let's just live with the minor inconsistency and leave this one as is.

[akien-mga]

Thanks!