diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-02-28 09:15:38 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-28 09:15:38 +0100 |
| commit | 4f64f3401a5f3652fdd2b01483011dbe0106352b (patch) | |
| tree | 96786e4a897cbfab3f73a81b14868a42f4ef5ba5 /editor/plugins/mesh_library_editor_plugin.cpp | |
| parent | 4ff84cbfb32e4ca7f4804c5d8f4c5267eb6a3e38 (diff) | |
| parent | 483994601d8c9f25185fc78e1ae60b19849b00f9 (diff) | |
| download | redot-engine-4f64f3401a5f3652fdd2b01483011dbe0106352b.tar.gz | |
Merge pull request #36388 from AndreaCatania/some_renames
Rename Navigation{Mesh,Polygon}Instance and PlaneShape for clarity
Diffstat (limited to 'editor/plugins/mesh_library_editor_plugin.cpp')
| -rw-r--r-- | editor/plugins/mesh_library_editor_plugin.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/editor/plugins/mesh_library_editor_plugin.cpp b/editor/plugins/mesh_library_editor_plugin.cpp index ea8842a56f..863ea451b5 100644 --- a/editor/plugins/mesh_library_editor_plugin.cpp +++ b/editor/plugins/mesh_library_editor_plugin.cpp @@ -34,7 +34,7 @@ #include "editor/editor_settings.h" #include "main/main.h" #include "scene/3d/mesh_instance.h" -#include "scene/3d/navigation_mesh_instance.h" +#include "scene/3d/navigation_region.h" #include "scene/3d/physics_body.h" #include "scene/main/viewport.h" #include "scene/resources/packed_scene.h" @@ -152,9 +152,9 @@ void MeshLibraryEditor::_import_scene(Node *p_scene, Ref<MeshLibrary> p_library, Transform navmesh_transform; for (int j = 0; j < mi->get_child_count(); j++) { Node *child2 = mi->get_child(j); - if (!Object::cast_to<NavigationMeshInstance>(child2)) + if (!Object::cast_to<NavigationRegion>(child2)) continue; - NavigationMeshInstance *sb = Object::cast_to<NavigationMeshInstance>(child2); + NavigationRegion *sb = Object::cast_to<NavigationRegion>(child2); navmesh = sb->get_navigation_mesh(); navmesh_transform = sb->get_transform(); if (!navmesh.is_null()) |