diff options
author | Juan Linietsky <reduzio@gmail.com> | 2020-03-27 13:47:15 -0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-03-27 13:47:15 -0300 |
commit | 307b1b3a5835ecdb477859785c673a07e248f904 (patch) | |
tree | cc0123bc7111e48775331d500452875c278cc13b /scene/resources/mesh_library.h | |
parent | f48aeeeeefa73d4c6e58ee2934eaf16bc0408df0 (diff) | |
parent | d1acbbce7f123c2b5fccdefc6417787dc91b6ced (diff) |
Merge pull request #37340 from reduz/rename-3d-nodes
Make 2D and 3D node names more explicit
Diffstat (limited to 'scene/resources/mesh_library.h')
-rw-r--r-- | scene/resources/mesh_library.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scene/resources/mesh_library.h b/scene/resources/mesh_library.h index b256e86b96..55001f2545 100644 --- a/scene/resources/mesh_library.h +++ b/scene/resources/mesh_library.h @@ -34,8 +34,8 @@ #include "core/map.h" #include "core/resource.h" #include "mesh.h" -#include "scene/3d/navigation_region.h" -#include "shape.h" +#include "scene/3d/navigation_region_3d.h" +#include "shape_3d.h" class MeshLibrary : public Resource { @@ -44,7 +44,7 @@ class MeshLibrary : public Resource { public: struct ShapeData { - Ref<Shape> shape; + Ref<Shape3D> shape; Transform local_transform; }; struct Item { |