Allow Building Editor with Navigation 3D disabled.

WhalesState · WhalesState · commit 3f600da59a23 · 2025-04-20T07:57:21.000+02:00
diff --git a/SConstruct b/SConstruct
@@ -968,7 +968,6 @@ if env.editor_build:
         "disable_physics_2d",
         "disable_physics_3d",
         "disable_navigation_2d",
-        "disable_navigation_3d",
     ]:
         if env[disable_opt]:
             unsupported_opts.append(disable_opt)
diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp
@@ -69,7 +69,9 @@
 #include "scene/theme/theme_db.h"
 #include "servers/display_server.h"
 #include "servers/navigation_server_2d.h"
+#ifndef NAVIGATION_3D_DISABLED
 #include "servers/navigation_server_3d.h"
+#endif // NAVIGATION_3D_DISABLED
 #include "servers/rendering_server.h"
 
 #include "editor/audio_stream_preview.h"
@@ -507,6 +509,7 @@ void EditorNode::_update_from_settings() {
 	NavigationServer2D::get_singleton()->set_debug_navigation_enable_edge_lines(GLOBAL_GET("debug/shapes/navigation/2d/enable_edge_lines"));
 	NavigationServer2D::get_singleton()->set_debug_navigation_enable_geometry_face_random_color(GLOBAL_GET("debug/shapes/navigation/2d/enable_geometry_face_random_color"));
 
+#ifndef NAVIGATION_3D_DISABLED
 	NavigationServer3D::get_singleton()->set_debug_navigation_edge_connection_color(GLOBAL_GET("debug/shapes/navigation/3d/edge_connection_color"));
 	NavigationServer3D::get_singleton()->set_debug_navigation_geometry_edge_color(GLOBAL_GET("debug/shapes/navigation/3d/geometry_edge_color"));
 	NavigationServer3D::get_singleton()->set_debug_navigation_geometry_face_color(GLOBAL_GET("debug/shapes/navigation/3d/geometry_face_color"));
@@ -517,6 +520,7 @@ void EditorNode::_update_from_settings() {
 	NavigationServer3D::get_singleton()->set_debug_navigation_enable_edge_lines(GLOBAL_GET("debug/shapes/navigation/3d/enable_edge_lines"));
 	NavigationServer3D::get_singleton()->set_debug_navigation_enable_edge_lines_xray(GLOBAL_GET("debug/shapes/navigation/3d/enable_edge_lines_xray"));
 	NavigationServer3D::get_singleton()->set_debug_navigation_enable_geometry_face_random_color(GLOBAL_GET("debug/shapes/navigation/3d/enable_geometry_face_random_color"));
+#endif // NAVIGATION_3D_DISABLED
 #endif // DEBUG_ENABLED
 }
 
@@ -7080,12 +7084,14 @@ EditorNode::EditorNode() {
 
 		AudioServer::get_singleton()->set_enable_tagging_used_audio_streams(true);
 
+#ifndef NAVIGATION_3D_DISABLED
 		// No navigation by default if in editor.
 		if (NavigationServer3D::get_singleton()->get_debug_enabled()) {
 			NavigationServer3D::get_singleton()->set_active(true);
 		} else {
 			NavigationServer3D::get_singleton()->set_active(false);
 		}
+#endif // NAVIGATION_3D_DISABLED
 
 		// No physics by default if in editor.
 #ifndef PHYSICS_3D_DISABLED
diff --git a/editor/import/3d/resource_importer_scene.cpp b/editor/import/3d/resource_importer_scene.cpp
@@ -40,7 +40,9 @@
 #include "editor/import/3d/scene_import_settings.h"
 #include "scene/3d/importer_mesh_instance_3d.h"
 #include "scene/3d/mesh_instance_3d.h"
+#ifndef NAVIGATION_3D_DISABLED
 #include "scene/3d/navigation/navigation_region_3d.h"
+#endif // NAVIGATION_3D_DISABLED
 #include "scene/3d/occluder_instance_3d.h"
 #include "scene/3d/physics/area_3d.h"
 #include "scene/3d/physics/collision_shape_3d.h"
@@ -907,6 +909,7 @@ Node *ResourceImporterScene::_pre_fix_node(Node *p_node, Node *p_root, HashMap<R
 			}
 		}
 
+#ifndef NAVIGATION_3D_DISABLED
 	} else if (_teststr(name, "navmesh") && Object::cast_to<ImporterMeshInstance3D>(p_node)) {
 		if (isroot) {
 			return p_node;
@@ -927,6 +930,7 @@ Node *ResourceImporterScene::_pre_fix_node(Node *p_node, Node *p_root, HashMap<R
 		p_node->set_owner(nullptr);
 		memdelete(p_node);
 		p_node = nmi;
+#endif // NAVIGATION_3D_DISABLED
 	} else if (_teststr(name, "occ") || _teststr(name, "occonly")) {
 		if (isroot) {
 			return p_node;
@@ -1672,6 +1676,7 @@ Node *ResourceImporterScene::_post_fix_node(Node *p_node, Node *p_root, HashMap<
 		}
 	}
 
+#ifndef NAVIGATION_3D_DISABLED
 	//navmesh (node may have changed type above)
 	if (Object::cast_to<ImporterMeshInstance3D>(p_node)) {
 		ImporterMeshInstance3D *mi = Object::cast_to<ImporterMeshInstance3D>(p_node);
@@ -1703,6 +1708,7 @@ Node *ResourceImporterScene::_post_fix_node(Node *p_node, Node *p_root, HashMap<
 			}
 		}
 	}
+#endif // NAVIGATION_3D_DISABLED
 
 	if (Object::cast_to<ImporterMeshInstance3D>(p_node)) {
 		ImporterMeshInstance3D *mi = Object::cast_to<ImporterMeshInstance3D>(p_node);
diff --git a/editor/plugins/gizmos/navigation_link_3d_gizmo_plugin.cpp b/editor/plugins/gizmos/navigation_link_3d_gizmo_plugin.cpp
@@ -28,6 +28,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
+#ifndef NAVIGATION_3D_DISABLED
+
 #include "navigation_link_3d_gizmo_plugin.h"
 
 #include "editor/editor_undo_redo_manager.h"
@@ -270,3 +272,5 @@ void NavigationLink3DGizmoPlugin::commit_handle(const EditorNode3DGizmo *p_gizmo
 
 	ur->commit_action();
 }
+
+#endif // NAVIGATION_3D_DISABLED
diff --git a/editor/plugins/gizmos/navigation_link_3d_gizmo_plugin.h b/editor/plugins/gizmos/navigation_link_3d_gizmo_plugin.h
@@ -30,6 +30,8 @@
 
 #pragma once
 
+#ifndef NAVIGATION_3D_DISABLED
+
 #include "editor/plugins/node_3d_editor_gizmos.h"
 
 class NavigationLink3DGizmoPlugin : public EditorNode3DGizmoPlugin {
@@ -48,3 +50,5 @@ class NavigationLink3DGizmoPlugin : public EditorNode3DGizmoPlugin {
 
 	NavigationLink3DGizmoPlugin();
 };
+
+#endif // NAVIGATION_3D_DISABLED
diff --git a/editor/plugins/gizmos/navigation_region_3d_gizmo_plugin.cpp b/editor/plugins/gizmos/navigation_region_3d_gizmo_plugin.cpp
@@ -28,6 +28,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
+#ifndef NAVIGATION_3D_DISABLED
+
 #include "navigation_region_3d_gizmo_plugin.h"
 
 #include "core/math/random_pcg.h"
@@ -206,3 +208,5 @@ void NavigationRegion3DGizmoPlugin::redraw(EditorNode3DGizmo *p_gizmo) {
 		p_gizmo->add_lines(line_vertex_array, navigationregion->is_enabled() ? get_material("edge_material", p_gizmo) : get_material("edge_material_disabled", p_gizmo));
 	}
 }
+
+#endif // NAVIGATION_3D_DISABLED
diff --git a/editor/plugins/gizmos/navigation_region_3d_gizmo_plugin.h b/editor/plugins/gizmos/navigation_region_3d_gizmo_plugin.h
@@ -30,6 +30,8 @@
 
 #pragma once
 
+#ifndef NAVIGATION_3D_DISABLED
+
 #include "editor/plugins/node_3d_editor_gizmos.h"
 
 class NavigationRegion3DGizmoPlugin : public EditorNode3DGizmoPlugin {
@@ -56,3 +58,5 @@ class NavigationRegion3DGizmoPlugin : public EditorNode3DGizmoPlugin {
 
 	NavigationRegion3DGizmoPlugin();
 };
+
+#endif // NAVIGATION_3D_DISABLED
diff --git a/editor/plugins/mesh_instance_3d_editor_plugin.cpp b/editor/plugins/mesh_instance_3d_editor_plugin.cpp
@@ -36,7 +36,9 @@
 #include "editor/multi_node_edit.h"
 #include "editor/plugins/node_3d_editor_plugin.h"
 #include "editor/themes/editor_scale.h"
+#ifndef NAVIGATION_3D_DISABLED
 #include "scene/3d/navigation/navigation_region_3d.h"
+#endif // NAVIGATION_3D_DISABLED
 #include "scene/3d/physics/collision_shape_3d.h"
 #include "scene/3d/physics/static_body_3d.h"
 #include "scene/gui/aspect_ratio_container.h"
@@ -214,7 +216,9 @@ void MeshInstance3DEditor::_menu_option(int p_option) {
 		} break;
 
 		case MENU_OPTION_CREATE_NAVMESH: {
+#ifndef NAVIGATION_3D_DISABLED
 			navigation_mesh_dialog->popup_centered(Vector2(200, 90));
+#endif // NAVIGATION_3D_DISABLED
 		} break;
 
 		case MENU_OPTION_CREATE_OUTLINE_MESH: {
@@ -485,6 +489,7 @@ void MeshInstance3DEditor::_debug_uv_draw() {
 }
 
 void MeshInstance3DEditor::_create_navigation_mesh() {
+#ifndef NAVIGATION_3D_DISABLED
 	Ref<Mesh> mesh = node->get_mesh();
 	if (mesh.is_null()) {
 		return;
@@ -512,6 +517,7 @@ void MeshInstance3DEditor::_create_navigation_mesh() {
 	ur->add_do_reference(nmi);
 	ur->add_undo_method(node, "remove_child", nmi);
 	ur->commit_action();
+#endif // NAVIGATION_3D_DISABLED
 }
 
 void MeshInstance3DEditor::_create_outline_mesh() {
@@ -574,7 +580,9 @@ MeshInstance3DEditor::MeshInstance3DEditor() {
 	Node3DEditor::get_singleton()->add_control_to_menu_panel(options);
 
 	options->get_popup()->add_item(TTR("Create Collision Shape..."), MENU_OPTION_CREATE_COLLISION_SHAPE);
+#ifndef NAVIGATION_3D_DISABLED
 	options->get_popup()->add_item(TTR("Create Navigation Mesh"), MENU_OPTION_CREATE_NAVMESH);
+#endif // NAVIGATION_3D_DISABLED
 	options->get_popup()->add_separator();
 	options->get_popup()->add_item(TTR("Create Outline Mesh..."), MENU_OPTION_CREATE_OUTLINE_MESH);
 	options->get_popup()->set_item_tooltip(options->get_popup()->get_item_count() - 1, TTR("Creates a static outline mesh. The outline mesh will have its normals flipped automatically.\nThis can be used instead of the StandardMaterial Grow property when using that property isn't possible."));
@@ -660,6 +668,7 @@ MeshInstance3DEditor::MeshInstance3DEditor() {
 	debug_uv->connect(SceneStringName(draw), callable_mp(this, &MeshInstance3DEditor::_debug_uv_draw));
 	debug_uv_arc->add_child(debug_uv);
 
+#ifndef NAVIGATION_3D_DISABLED
 	navigation_mesh_dialog = memnew(ConfirmationDialog);
 	navigation_mesh_dialog->set_title(TTR("Create NavigationMesh"));
 	navigation_mesh_dialog->set_ok_button_text(TTR("Create"));
@@ -673,6 +682,7 @@ MeshInstance3DEditor::MeshInstance3DEditor() {
 
 	add_child(navigation_mesh_dialog);
 	navigation_mesh_dialog->connect(SceneStringName(confirmed), callable_mp(this, &MeshInstance3DEditor::_create_navigation_mesh));
+#endif // NAVIGATION_3D_DISABLED
 }
 
 void MeshInstance3DEditorPlugin::edit(Object *p_object) {
diff --git a/editor/plugins/mesh_library_editor_plugin.cpp b/editor/plugins/mesh_library_editor_plugin.cpp
@@ -39,7 +39,9 @@
 #include "editor/plugins/node_3d_editor_plugin.h"
 #include "main/main.h"
 #include "scene/3d/mesh_instance_3d.h"
+#ifndef NAVIGATION_3D_DISABLED
 #include "scene/3d/navigation/navigation_region_3d.h"
+#endif // NAVIGATION_3D_DISABLED
 #include "scene/3d/physics/static_body_3d.h"
 #include "scene/gui/menu_button.h"
 #include "scene/resources/packed_scene.h"
@@ -210,6 +212,7 @@ void MeshLibraryEditor::_import_scene_parse_node(Ref<MeshLibrary> p_library, Has
 	}
 	p_library->set_item_shapes(item_id, collisions);
 
+#ifndef NAVIGATION_3D_DISABLED
 	for (int i = 0; i < mesh_instance_node->get_child_count(); i++) {
 		NavigationRegion3D *navigation_region_node = Object::cast_to<NavigationRegion3D>(mesh_instance_node->get_child(i));
 		if (!navigation_region_node) {
@@ -223,6 +226,7 @@ void MeshLibraryEditor::_import_scene_parse_node(Ref<MeshLibrary> p_library, Has
 			break;
 		}
 	}
+#endif // NAVIGATION_3D_DISABLED
 }
 
 Error MeshLibraryEditor::update_library_file(Node *p_base_scene, Ref<MeshLibrary> ml, bool p_merge, bool p_apply_xforms) {
diff --git a/editor/plugins/navigation_obstacle_3d_editor_plugin.cpp b/editor/plugins/navigation_obstacle_3d_editor_plugin.cpp
@@ -28,6 +28,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
+#ifndef NAVIGATION_3D_DISABLED
+
 #include "navigation_obstacle_3d_editor_plugin.h"
 
 #include "core/math/geometry_2d.h"
@@ -900,3 +902,5 @@ NavigationObstacle3DEditorPlugin::~NavigationObstacle3DEditorPlugin() {
 		point_handle_mesh_rid = RID();
 	}
 }
+
+#endif // NAVIGATION_3D_DISABLED
diff --git a/editor/plugins/navigation_obstacle_3d_editor_plugin.h b/editor/plugins/navigation_obstacle_3d_editor_plugin.h
@@ -30,6 +30,8 @@
 
 #pragma once
 
+#ifndef NAVIGATION_3D_DISABLED
+
 #include "editor/plugins/editor_plugin.h"
 #include "editor/plugins/node_3d_editor_gizmos.h"
 #include "scene/gui/box_container.h"
@@ -132,3 +134,5 @@ class NavigationObstacle3DEditorPlugin : public EditorPlugin {
 	NavigationObstacle3DEditorPlugin();
 	~NavigationObstacle3DEditorPlugin();
 };
+
+#endif // NAVIGATION_3D_DISABLED
diff --git a/editor/plugins/node_3d_editor_plugin.cpp b/editor/plugins/node_3d_editor_plugin.cpp
@@ -64,8 +64,10 @@
 #include "editor/plugins/gizmos/lightmap_probe_gizmo_plugin.h"
 #include "editor/plugins/gizmos/marker_3d_gizmo_plugin.h"
 #include "editor/plugins/gizmos/mesh_instance_3d_gizmo_plugin.h"
+#ifndef NAVIGATION_3D_DISABLED
 #include "editor/plugins/gizmos/navigation_link_3d_gizmo_plugin.h"
 #include "editor/plugins/gizmos/navigation_region_3d_gizmo_plugin.h"
+#endif // NAVIGATION_3D_DISABLED
 #include "editor/plugins/gizmos/occluder_instance_3d_gizmo_plugin.h"
 #include "editor/plugins/gizmos/particles_3d_emission_shape_gizmo_plugin.h"
 #include "editor/plugins/gizmos/physics_bone_3d_gizmo_plugin.h"
@@ -8719,8 +8721,10 @@ void Node3DEditor::_register_all_gizmos() {
 	add_gizmo_plugin(Ref<CollisionObject3DGizmoPlugin>(memnew(CollisionObject3DGizmoPlugin)));
 	add_gizmo_plugin(Ref<CollisionShape3DGizmoPlugin>(memnew(CollisionShape3DGizmoPlugin)));
 	add_gizmo_plugin(Ref<CollisionPolygon3DGizmoPlugin>(memnew(CollisionPolygon3DGizmoPlugin)));
+#ifndef NAVIGATION_3D_DISABLED
 	add_gizmo_plugin(Ref<NavigationLink3DGizmoPlugin>(memnew(NavigationLink3DGizmoPlugin)));
 	add_gizmo_plugin(Ref<NavigationRegion3DGizmoPlugin>(memnew(NavigationRegion3DGizmoPlugin)));
+#endif // NAVIGATION_3D_DISABLED
 	add_gizmo_plugin(Ref<Joint3DGizmoPlugin>(memnew(Joint3DGizmoPlugin)));
 	add_gizmo_plugin(Ref<PhysicalBone3DGizmoPlugin>(memnew(PhysicalBone3DGizmoPlugin)));
 	add_gizmo_plugin(Ref<FogVolumeGizmoPlugin>(memnew(FogVolumeGizmoPlugin)));
diff --git a/editor/project_manager.cpp b/editor/project_manager.cpp
@@ -1181,7 +1181,11 @@ ProjectManager::ProjectManager() {
 	singleton = this;
 
 	// Turn off some servers we aren't going to be using in the Project Manager.
+
+#ifndef NAVIGATION_3D_DISABLED
 	NavigationServer3D::get_singleton()->set_active(false);
+#endif // NAVIGATION_3D_DISABLED
+
 	PhysicsServer3D::get_singleton()->set_active(false);
 	PhysicsServer2D::get_singleton()->set_active(false);
 
diff --git a/editor/register_editor_types.cpp b/editor/register_editor_types.cpp
@@ -98,7 +98,9 @@
 #include "editor/plugins/multimesh_editor_plugin.h"
 #include "editor/plugins/navigation_link_2d_editor_plugin.h"
 #include "editor/plugins/navigation_obstacle_2d_editor_plugin.h"
+#ifndef NAVIGATION_3D_DISABLED
 #include "editor/plugins/navigation_obstacle_3d_editor_plugin.h"
+#endif // NAVIGATION_3D_DISABLED
 #include "editor/plugins/navigation_polygon_editor_plugin.h"
 #include "editor/plugins/node_3d_editor_gizmos.h"
 #include "editor/plugins/occluder_instance_3d_editor_plugin.h"
@@ -230,7 +232,9 @@ void register_editor_types() {
 	EditorPlugins::add_by_type<MeshInstance3DEditorPlugin>();
 	EditorPlugins::add_by_type<MeshLibraryEditorPlugin>();
 	EditorPlugins::add_by_type<MultiMeshEditorPlugin>();
+#ifndef NAVIGATION_3D_DISABLED
 	EditorPlugins::add_by_type<NavigationObstacle3DEditorPlugin>();
+#endif // NAVIGATION_3D_DISABLED
 	EditorPlugins::add_by_type<OccluderInstance3DEditorPlugin>();
 	EditorPlugins::add_by_type<PackedSceneEditorPlugin>();
 	EditorPlugins::add_by_type<Path3DEditorPlugin>();
diff --git a/scene/resources/3d/world_3d.cpp b/scene/resources/3d/world_3d.cpp
@@ -34,7 +34,9 @@
 #include "scene/3d/camera_3d.h"
 #include "scene/resources/camera_attributes.h"
 #include "scene/resources/environment.h"
+#ifndef NAVIGATION_3D_DISABLED
 #include "servers/navigation_server_3d.h"
+#endif // NAVIGATION_3D_DISABLED
 
 void World3D::_register_camera(Camera3D *p_camera) {
 	cameras.insert(p_camera);
@@ -58,6 +60,7 @@ RID World3D::get_space() const {
 	return space;
 }
 
+#ifndef NAVIGATION_3D_DISABLED
 RID World3D::get_navigation_map() const {
 	if (navigation_map.is_null()) {
 		navigation_map = NavigationServer3D::get_singleton()->map_create();
@@ -72,6 +75,7 @@ RID World3D::get_navigation_map() const {
 	}
 	return navigation_map;
 }
+#endif // NAVIGATION_3D_DISABLED
 
 RID World3D::get_scenario() const {
 	return scenario;
@@ -149,7 +153,9 @@ PhysicsDirectSpaceState3D *World3D::get_direct_space_state() {
 
 void World3D::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_space"), &World3D::get_space);
+#ifndef NAVIGATION_3D_DISABLED
 	ClassDB::bind_method(D_METHOD("get_navigation_map"), &World3D::get_navigation_map);
+#endif // NAVIGATION_3D_DISABLED
 	ClassDB::bind_method(D_METHOD("get_scenario"), &World3D::get_scenario);
 	ClassDB::bind_method(D_METHOD("set_environment", "env"), &World3D::set_environment);
 	ClassDB::bind_method(D_METHOD("get_environment"), &World3D::get_environment);
@@ -164,7 +170,9 @@ void World3D::_bind_methods() {
 	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "fallback_environment", PROPERTY_HINT_RESOURCE_TYPE, "Environment"), "set_fallback_environment", "get_fallback_environment");
 	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "camera_attributes", PROPERTY_HINT_RESOURCE_TYPE, "CameraAttributesPractical,CameraAttributesPhysical"), "set_camera_attributes", "get_camera_attributes");
 	ADD_PROPERTY(PropertyInfo(Variant::RID, "space", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NONE), "", "get_space");
+#ifndef NAVIGATION_3D_DISABLED
 	ADD_PROPERTY(PropertyInfo(Variant::RID, "navigation_map", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NONE), "", "get_navigation_map");
+#endif // NAVIGATION_3D_DISABLED
 	ADD_PROPERTY(PropertyInfo(Variant::RID, "scenario", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NONE), "", "get_scenario");
 #ifndef PHYSICS_3D_DISABLED
 	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "direct_space_state", PROPERTY_HINT_RESOURCE_TYPE, "PhysicsDirectSpaceState3D", PROPERTY_USAGE_NONE), "", "get_direct_space_state");
@@ -180,15 +188,19 @@ World3D::~World3D() {
 #ifndef PHYSICS_3D_DISABLED
 	ERR_FAIL_NULL(PhysicsServer3D::get_singleton());
 #endif // PHYSICS_3D_DISABLED
+#ifndef NAVIGATION_3D_DISABLED
 	ERR_FAIL_NULL(NavigationServer3D::get_singleton());
+#endif // NAVIGATION_3D_DISABLED
 
 	RenderingServer::get_singleton()->free(scenario);
 #ifndef PHYSICS_3D_DISABLED
 	if (space.is_valid()) {
 		PhysicsServer3D::get_singleton()->free(space);
 	}
 #endif // PHYSICS_3D_DISABLED
+#ifndef NAVIGATION_3D_DISABLED
 	if (navigation_map.is_valid()) {
 		NavigationServer3D::get_singleton()->free(navigation_map);
 	}
+#endif // NAVIGATION_3D_DISABLED
 }
diff --git a/scene/resources/3d/world_3d.h b/scene/resources/3d/world_3d.h

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,9 @@`
`40`	`40`	`#include "editor/import/3d/scene_import_settings.h"`
`41`	`41`	`#include "scene/3d/importer_mesh_instance_3d.h"`
`42`	`42`	`#include "scene/3d/mesh_instance_3d.h"`
	`43`	`+#ifndef NAVIGATION_3D_DISABLED`
`43`	`44`	`#include "scene/3d/navigation/navigation_region_3d.h"`
	`45`	`+#endif // NAVIGATION_3D_DISABLED`
`44`	`46`	`#include "scene/3d/occluder_instance_3d.h"`
`45`	`47`	`#include "scene/3d/physics/area_3d.h"`
`46`	`48`	`#include "scene/3d/physics/collision_shape_3d.h"`
`@@ -907,6 +909,7 @@ Node ResourceImporterScene::_pre_fix_node(Node p_node, Node *p_root, HashMap<R`
`907`	`909`	`}`
`908`	`910`	`}`
`909`	`911`
	`912`	`+#ifndef NAVIGATION_3D_DISABLED`
`910`	`913`	`} else if (_teststr(name, "navmesh") && Object::cast_to<ImporterMeshInstance3D>(p_node)) {`
`911`	`914`	`if (isroot) {`
`912`	`915`	`return p_node;`
`@@ -927,6 +930,7 @@ Node ResourceImporterScene::_pre_fix_node(Node p_node, Node *p_root, HashMap<R`
`927`	`930`	`p_node->set_owner(nullptr);`
`928`	`931`	`memdelete(p_node);`
`929`	`932`	`p_node = nmi;`
	`933`	`+#endif // NAVIGATION_3D_DISABLED`
`930`	`934`	`} else if (_teststr(name, "occ") \|\| _teststr(name, "occonly")) {`
`931`	`935`	`if (isroot) {`
`932`	`936`	`return p_node;`
`@@ -1672,6 +1676,7 @@ Node ResourceImporterScene::_post_fix_node(Node p_node, Node *p_root, HashMap<`
`1672`	`1676`	`}`
`1673`	`1677`	`}`
`1674`	`1678`
	`1679`	`+#ifndef NAVIGATION_3D_DISABLED`
`1675`	`1680`	`//navmesh (node may have changed type above)`
`1676`	`1681`	`if (Object::cast_to<ImporterMeshInstance3D>(p_node)) {`
`1677`	`1682`	`ImporterMeshInstance3D *mi = Object::cast_to<ImporterMeshInstance3D>(p_node);`
`@@ -1703,6 +1708,7 @@ Node ResourceImporterScene::_post_fix_node(Node p_node, Node *p_root, HashMap<`
`1703`	`1708`	`}`
`1704`	`1709`	`}`
`1705`	`1710`	`}`
	`1711`	`+#endif // NAVIGATION_3D_DISABLED`
`1706`	`1712`
`1707`	`1713`	`if (Object::cast_to<ImporterMeshInstance3D>(p_node)) {`
`1708`	`1714`	`ImporterMeshInstance3D *mi = Object::cast_to<ImporterMeshInstance3D>(p_node);`
Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,8 @@`
`28`	`28`	`/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */`
`29`	`29`	`/**************************************************************************/`
`30`	`30`
	`31`	`+#ifndef NAVIGATION_3D_DISABLED`
	`32`	`+`
`31`	`33`	`#include "navigation_region_3d_gizmo_plugin.h"`
`32`	`34`
`33`	`35`	`#include "core/math/random_pcg.h"`
`@@ -206,3 +208,5 @@ void NavigationRegion3DGizmoPlugin::redraw(EditorNode3DGizmo *p_gizmo) {`
`206`	`208`	`p_gizmo->add_lines(line_vertex_array, navigationregion->is_enabled() ? get_material("edge_material", p_gizmo) : get_material("edge_material_disabled", p_gizmo));`
`207`	`209`	`}`
`208`	`210`	`}`
	`211`	`+`
	`212`	`+#endif // NAVIGATION_3D_DISABLED`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,9 @@`
`39`	`39`	`#include "editor/plugins/node_3d_editor_plugin.h"`
`40`	`40`	`#include "main/main.h"`
`41`	`41`	`#include "scene/3d/mesh_instance_3d.h"`
	`42`	`+#ifndef NAVIGATION_3D_DISABLED`
`42`	`43`	`#include "scene/3d/navigation/navigation_region_3d.h"`
	`44`	`+#endif // NAVIGATION_3D_DISABLED`
`43`	`45`	`#include "scene/3d/physics/static_body_3d.h"`
`44`	`46`	`#include "scene/gui/menu_button.h"`
`45`	`47`	`#include "scene/resources/packed_scene.h"`
`@@ -210,6 +212,7 @@ void MeshLibraryEditor::_import_scene_parse_node(Ref<MeshLibrary> p_library, Has`
`210`	`212`	`}`
`211`	`213`	`p_library->set_item_shapes(item_id, collisions);`
`212`	`214`
	`215`	`+#ifndef NAVIGATION_3D_DISABLED`
`213`	`216`	`for (int i = 0; i < mesh_instance_node->get_child_count(); i++) {`
`214`	`217`	`NavigationRegion3D *navigation_region_node = Object::cast_to<NavigationRegion3D>(mesh_instance_node->get_child(i));`
`215`	`218`	`if (!navigation_region_node) {`
`@@ -223,6 +226,7 @@ void MeshLibraryEditor::_import_scene_parse_node(Ref<MeshLibrary> p_library, Has`
`223`	`226`	`break;`
`224`	`227`	`}`
`225`	`228`	`}`
	`229`	`+#endif // NAVIGATION_3D_DISABLED`
`226`	`230`	`}`
`227`	`231`
`228`	`232`	`Error MeshLibraryEditor::update_library_file(Node *p_base_scene, Ref<MeshLibrary> ml, bool p_merge, bool p_apply_xforms) {`