Skip to content

Commit e36632a

Browse files
committed
Merge pull request #105588 from smix8/navobstacle_3d_plugin
Move `NavigationObstacle3DEditorPlugin` to `navigation_3d` module
2 parents 2d3b25e + 3307be5 commit e36632a

File tree

4 files changed

+2
-2
lines changed

4 files changed

+2
-2
lines changed

editor/register_editor_types.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,6 @@
9999
#include "editor/plugins/multimesh_editor_plugin.h"
100100
#include "editor/plugins/navigation_link_2d_editor_plugin.h"
101101
#include "editor/plugins/navigation_obstacle_2d_editor_plugin.h"
102-
#include "editor/plugins/navigation_obstacle_3d_editor_plugin.h"
103102
#include "editor/plugins/navigation_polygon_editor_plugin.h"
104103
#include "editor/plugins/node_3d_editor_gizmos.h"
105104
#include "editor/plugins/occluder_instance_3d_editor_plugin.h"
@@ -234,7 +233,6 @@ void register_editor_types() {
234233
EditorPlugins::add_by_type<MeshInstance3DEditorPlugin>();
235234
EditorPlugins::add_by_type<MeshLibraryEditorPlugin>();
236235
EditorPlugins::add_by_type<MultiMeshEditorPlugin>();
237-
EditorPlugins::add_by_type<NavigationObstacle3DEditorPlugin>();
238236
EditorPlugins::add_by_type<OccluderInstance3DEditorPlugin>();
239237
EditorPlugins::add_by_type<PackedSceneEditorPlugin>();
240238
EditorPlugins::add_by_type<Path3DEditorPlugin>();

modules/navigation_3d/register_types.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
#endif // DISABLE_DEPRECATED
3838

3939
#ifdef TOOLS_ENABLED
40+
#include "editor/navigation_obstacle_3d_editor_plugin.h"
4041
#include "editor/navigation_region_3d_editor_plugin.h"
4142
#endif
4243

@@ -65,6 +66,7 @@ void initialize_navigation_3d_module(ModuleInitializationLevel p_level) {
6566
#ifdef TOOLS_ENABLED
6667
if (p_level == MODULE_INITIALIZATION_LEVEL_EDITOR) {
6768
EditorPlugins::add_by_type<NavigationRegion3DEditorPlugin>();
69+
EditorPlugins::add_by_type<NavigationObstacle3DEditorPlugin>();
6870
}
6971
#endif
7072
}

0 commit comments

Comments
 (0)