From 3307be5038744073d26d17443fb32f0ccab5493a Mon Sep 17 00:00:00 2001 From: smix8 <52464204+smix8@users.noreply.github.com> Date: Sun, 20 Apr 2025 17:29:16 +0200 Subject: [PATCH] Move NavigationObstacle3DEditorPlugin to navigation_3d module Moves NavigationObstacle3DEditorPlugin to navigation_3d module. --- editor/register_editor_types.cpp | 2 -- .../editor}/navigation_obstacle_3d_editor_plugin.cpp | 0 .../editor}/navigation_obstacle_3d_editor_plugin.h | 0 modules/navigation_3d/register_types.cpp | 2 ++ 4 files changed, 2 insertions(+), 2 deletions(-) rename {editor/plugins => modules/navigation_3d/editor}/navigation_obstacle_3d_editor_plugin.cpp (100%) rename {editor/plugins => modules/navigation_3d/editor}/navigation_obstacle_3d_editor_plugin.h (100%) diff --git a/editor/register_editor_types.cpp b/editor/register_editor_types.cpp index b7d1e2a96ce..40c0025e5ab 100644 --- a/editor/register_editor_types.cpp +++ b/editor/register_editor_types.cpp @@ -99,7 +99,6 @@ #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" -#include "editor/plugins/navigation_obstacle_3d_editor_plugin.h" #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" @@ -234,7 +233,6 @@ void register_editor_types() { EditorPlugins::add_by_type(); EditorPlugins::add_by_type(); EditorPlugins::add_by_type(); - EditorPlugins::add_by_type(); EditorPlugins::add_by_type(); EditorPlugins::add_by_type(); EditorPlugins::add_by_type(); diff --git a/editor/plugins/navigation_obstacle_3d_editor_plugin.cpp b/modules/navigation_3d/editor/navigation_obstacle_3d_editor_plugin.cpp similarity index 100% rename from editor/plugins/navigation_obstacle_3d_editor_plugin.cpp rename to modules/navigation_3d/editor/navigation_obstacle_3d_editor_plugin.cpp diff --git a/editor/plugins/navigation_obstacle_3d_editor_plugin.h b/modules/navigation_3d/editor/navigation_obstacle_3d_editor_plugin.h similarity index 100% rename from editor/plugins/navigation_obstacle_3d_editor_plugin.h rename to modules/navigation_3d/editor/navigation_obstacle_3d_editor_plugin.h diff --git a/modules/navigation_3d/register_types.cpp b/modules/navigation_3d/register_types.cpp index 2c50dbd0c1b..0d21073b22f 100644 --- a/modules/navigation_3d/register_types.cpp +++ b/modules/navigation_3d/register_types.cpp @@ -37,6 +37,7 @@ #endif // DISABLE_DEPRECATED #ifdef TOOLS_ENABLED +#include "editor/navigation_obstacle_3d_editor_plugin.h" #include "editor/navigation_region_3d_editor_plugin.h" #endif @@ -65,6 +66,7 @@ void initialize_navigation_3d_module(ModuleInitializationLevel p_level) { #ifdef TOOLS_ENABLED if (p_level == MODULE_INITIALIZATION_LEVEL_EDITOR) { EditorPlugins::add_by_type(); + EditorPlugins::add_by_type(); } #endif }