Merge pull request #104811 from YeldhamDev/build_no_navigation

Allow to compile templates without navigation features

modules/navigation_3d/3d/navigation_mesh_generator.h

@@ -30,7 +30,7 @@
 
 #pragma once
 
-#include "scene/3d/navigation_region_3d.h"
+#include "scene/3d/navigation/navigation_region_3d.h"
 #include "scene/resources/navigation_mesh.h"
 
 class NavigationMeshSourceGeometryData3D;

modules/navigation_3d/config.py

@@ -1,6 +1,9 @@
 def can_build(env, platform):
+    if env["disable_navigation_3d"]:
+        return False
+
     env.module_add_dependencies("navigation", ["csg", "gridmap"], True)
-    return not env["disable_3d"]
+    return True
 
 
 def configure(env):

modules/navigation_3d/editor/navigation_mesh_editor_plugin.cpp

@@ -32,7 +32,7 @@
 
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
-#include "scene/3d/navigation_region_3d.h"
+#include "scene/3d/navigation/navigation_region_3d.h"
 #include "scene/gui/box_container.h"
 #include "scene/gui/button.h"
 #include "scene/gui/dialogs.h"