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 /scene/3d/collision_shape.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 'scene/3d/collision_shape.cpp')
| -rw-r--r-- | scene/3d/collision_shape.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/scene/3d/collision_shape.cpp b/scene/3d/collision_shape.cpp index d0d775d557..c7a92b66e1 100644 --- a/scene/3d/collision_shape.cpp +++ b/scene/3d/collision_shape.cpp @@ -33,9 +33,9 @@ #include "scene/resources/capsule_shape.h" #include "scene/resources/concave_polygon_shape.h" #include "scene/resources/convex_polygon_shape.h" -#include "scene/resources/plane_shape.h" #include "scene/resources/ray_shape.h" #include "scene/resources/sphere_shape.h" +#include "scene/resources/world_margin_shape.h" #include "servers/visual_server.h" //TODO: Implement CylinderShape and HeightMapShape? #include "core/math/quick_hull.h" @@ -123,10 +123,6 @@ String CollisionShape::get_configuration_warning() const { return TTR("A shape must be provided for CollisionShape to function. Please create a shape resource for it."); } - if (shape->is_class("PlaneShape")) { - return TTR("Plane shapes don't work well and will be removed in future versions. Please don't use them."); - } - return String(); } |