diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2022-12-20 10:32:05 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2022-12-20 10:32:05 +0100 |
| commit | 5aab37f4b814957da1d00054ce3f2b4d433e170b (patch) | |
| tree | 723de01707d06cf570c3520eda873bcb6edfc410 | |
| parent | 281f548dc24f39b21b5c430934e3c4cafddccd1b (diff) | |
| parent | a39d8948113180fc914deb908c45fdb23370e704 (diff) | |
Merge pull request #70312 from MarcusElg/rigidbodyworldboundarywarning
Show warning when having a WorldBoundaryShape3D as a child of a RigidBody3D
| -rw-r--r-- | scene/3d/collision_shape_3d.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/scene/3d/collision_shape_3d.cpp b/scene/3d/collision_shape_3d.cpp index ef381641ab..2729dfc369 100644 --- a/scene/3d/collision_shape_3d.cpp +++ b/scene/3d/collision_shape_3d.cpp @@ -34,6 +34,7 @@ #include "physics_body_3d.h" #include "scene/resources/concave_polygon_shape_3d.h" #include "scene/resources/convex_polygon_shape_3d.h" +#include "scene/resources/world_boundary_shape_3d.h" void CollisionShape3D::make_convex_from_siblings() { Node *p = get_parent(); @@ -125,10 +126,12 @@ PackedStringArray CollisionShape3D::get_configuration_warnings() const { warnings.push_back(RTR("A shape must be provided for CollisionShape3D to function. Please create a shape resource for it.")); } - if (shape.is_valid() && - Object::cast_to<RigidBody3D>(get_parent()) && - Object::cast_to<ConcavePolygonShape3D>(*shape)) { - warnings.push_back(RTR("ConcavePolygonShape3D doesn't support RigidBody3D in another mode than static.")); + if (shape.is_valid() && Object::cast_to<RigidBody3D>(get_parent())) { + if (Object::cast_to<ConcavePolygonShape3D>(*shape)) { + warnings.push_back(RTR("ConcavePolygonShape3D doesn't support RigidBody3D in another mode than static.")); + } else if (Object::cast_to<WorldBoundaryShape3D>(*shape)) { + warnings.push_back(RTR("WorldBoundaryShape3D doesn't support RigidBody3D in another mode than static.")); + } } return warnings; |