seedlingattempt/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #105588 from smix8/navobstacle_3d_plugin

Browse Source 
Move `NavigationObstacle3DEditorPlugin` to `navigation_3d` module
This commit is contained in:
Thaddeus Crews
2025-05-08 07:19:38 -05:00
parent 2d3b25e61d 3307be5038
commit e36632a71d
4 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
editor/register_editor_types.cpp
View File

@ -99,7 +99,6 @@
#include "editor/plugins/multimesh_editor_plugin.h" #include "editor/plugins/multimesh_editor_plugin.h"
#include "editor/plugins/navigation_link_2d_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_2d_editor_plugin.h"
#include "editor/plugins/navigation_obstacle_3d_editor_plugin.h"
#include "editor/plugins/navigation_polygon_editor_plugin.h" #include "editor/plugins/navigation_polygon_editor_plugin.h"
#include "editor/plugins/node_3d_editor_gizmos.h" #include "editor/plugins/node_3d_editor_gizmos.h"
#include "editor/plugins/occluder_instance_3d_editor_plugin.h" #include "editor/plugins/occluder_instance_3d_editor_plugin.h"
@ -234,7 +233,6 @@ void register_editor_types() {
EditorPlugins::add_by_type<MeshInstance3DEditorPlugin>(); EditorPlugins::add_by_type<MeshInstance3DEditorPlugin>();
EditorPlugins::add_by_type<MeshLibraryEditorPlugin>(); EditorPlugins::add_by_type<MeshLibraryEditorPlugin>();
EditorPlugins::add_by_type<MultiMeshEditorPlugin>(); EditorPlugins::add_by_type<MultiMeshEditorPlugin>();
EditorPlugins::add_by_type<NavigationObstacle3DEditorPlugin>();
EditorPlugins::add_by_type<OccluderInstance3DEditorPlugin>(); EditorPlugins::add_by_type<OccluderInstance3DEditorPlugin>();
EditorPlugins::add_by_type<PackedSceneEditorPlugin>(); EditorPlugins::add_by_type<PackedSceneEditorPlugin>();
EditorPlugins::add_by_type<Path3DEditorPlugin>(); EditorPlugins::add_by_type<Path3DEditorPlugin>();

0
editor/plugins/navigation_obstacle_3d_editor_plugin.cpp → modules/navigation_3d/editor/navigation_obstacle_3d_editor_plugin.cpp
View File

0
editor/plugins/navigation_obstacle_3d_editor_plugin.h → modules/navigation_3d/editor/navigation_obstacle_3d_editor_plugin.h
View File

2
modules/navigation_3d/register_types.cpp
View File

@ -37,6 +37,7 @@
#endif // DISABLE_DEPRECATED #endif // DISABLE_DEPRECATED
#ifdef TOOLS_ENABLED #ifdef TOOLS_ENABLED
#include "editor/navigation_obstacle_3d_editor_plugin.h"
#include "editor/navigation_region_3d_editor_plugin.h" #include "editor/navigation_region_3d_editor_plugin.h"
#endif #endif
@ -65,6 +66,7 @@ void initialize_navigation_3d_module(ModuleInitializationLevel p_level) {
#ifdef TOOLS_ENABLED #ifdef TOOLS_ENABLED
if (p_level == MODULE_INITIALIZATION_LEVEL_EDITOR) { if (p_level == MODULE_INITIALIZATION_LEVEL_EDITOR) {
EditorPlugins::add_by_type<NavigationRegion3DEditorPlugin>(); EditorPlugins::add_by_type<NavigationRegion3DEditorPlugin>();
EditorPlugins::add_by_type<NavigationObstacle3DEditorPlugin>();
} }
#endif #endif
} }