Merge pull request #105593 from smix8/navregion_3d_gizmo_plugin

Move `NavigationRegion3DGizmoPlugin` to `navigation_3d` module.

editor/plugins/node_3d_editor_plugin.cpp

@@ -65,7 +65,6 @@
 #include "editor/plugins/gizmos/marker_3d_gizmo_plugin.h"
 #include "editor/plugins/gizmos/mesh_instance_3d_gizmo_plugin.h"
 #include "editor/plugins/gizmos/navigation_link_3d_gizmo_plugin.h"
-#include "editor/plugins/gizmos/navigation_region_3d_gizmo_plugin.h"
 #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"
@@ -8733,7 +8732,6 @@ void Node3DEditor::_register_all_gizmos() {
 	add_gizmo_plugin(Ref<CollisionShape3DGizmoPlugin>(memnew(CollisionShape3DGizmoPlugin)));
 	add_gizmo_plugin(Ref<CollisionPolygon3DGizmoPlugin>(memnew(CollisionPolygon3DGizmoPlugin)));
 	add_gizmo_plugin(Ref<NavigationLink3DGizmoPlugin>(memnew(NavigationLink3DGizmoPlugin)));
-	add_gizmo_plugin(Ref<NavigationRegion3DGizmoPlugin>(memnew(NavigationRegion3DGizmoPlugin)));
 	add_gizmo_plugin(Ref<Joint3DGizmoPlugin>(memnew(Joint3DGizmoPlugin)));
 	add_gizmo_plugin(Ref<PhysicalBone3DGizmoPlugin>(memnew(PhysicalBone3DGizmoPlugin)));
 	add_gizmo_plugin(Ref<FogVolumeGizmoPlugin>(memnew(FogVolumeGizmoPlugin)));

modules/navigation_3d/editor/navigation_region_3d_editor_plugin.cpp

@@ -32,6 +32,7 @@
 
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
+#include "editor/plugins/node_3d_editor_plugin.h"
 #include "scene/3d/navigation/navigation_region_3d.h"
 #include "scene/gui/box_container.h"
 #include "scene/gui/button.h"
@@ -173,4 +174,7 @@ NavigationRegion3DEditorPlugin::NavigationRegion3DEditorPlugin() {
 	add_control_to_container(CONTAINER_SPATIAL_EDITOR_MENU, navigation_region_editor->bake_hbox);
 	navigation_region_editor->hide();
 	navigation_region_editor->bake_hbox->hide();
+
+	gizmo_plugin.instantiate();
+	Node3DEditor::get_singleton()->add_gizmo_plugin(gizmo_plugin);
 }

modules/navigation_3d/editor/navigation_region_3d_editor_plugin.h

@@ -32,6 +32,8 @@
 
 #include "editor/plugins/editor_plugin.h"
 
+#include "navigation_region_3d_gizmo_plugin.h"
+
 class AcceptDialog;
 class Button;
 class HBoxContainer;
@@ -69,6 +71,8 @@ class NavigationRegion3DEditorPlugin : public EditorPlugin {
 
 	NavigationRegion3DEditor *navigation_region_editor = nullptr;
 
+	Ref<NavigationRegion3DGizmoPlugin> gizmo_plugin;
+
 public:
 	virtual String get_plugin_name() const override { return "NavigationRegion3D"; }
 	bool has_main_screen() const override { return false; }