diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-10-01 14:03:29 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-01 14:03:29 +0200 |
| commit | 12091b39d275b15a0aa93b944a670eec8b92d51b (patch) | |
| tree | 46e2e9a4d1bbd93435f270b6a088287f2515e862 /scene/3d/collision_shape_3d.cpp | |
| parent | 23ab8ea6f62e0859313d282bc68982b05332cadb (diff) | |
| parent | 9fc2b0fddcaeee3085e42512d7df5c39aec1368c (diff) | |
| download | redot-engine-12091b39d275b15a0aa93b944a670eec8b92d51b.tar.gz | |
Merge pull request #38743 from arrowinaknee/node-config-warnings
Update all get_configuration_warning() to retrieve warnings from the parent
Diffstat (limited to 'scene/3d/collision_shape_3d.cpp')
| -rw-r--r-- | scene/3d/collision_shape_3d.cpp | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/scene/3d/collision_shape_3d.cpp b/scene/3d/collision_shape_3d.cpp index e7f3f53ca9..6ff0ce6032 100644 --- a/scene/3d/collision_shape_3d.cpp +++ b/scene/3d/collision_shape_3d.cpp @@ -124,23 +124,34 @@ void CollisionShape3D::resource_changed(RES res) { } String CollisionShape3D::get_configuration_warning() const { + String warning = Node3D::get_configuration_warning(); + if (!Object::cast_to<CollisionObject3D>(get_parent())) { - return TTR("CollisionShape3D only serves to provide a collision shape to a CollisionObject3D derived node. Please only use it as a child of Area3D, StaticBody3D, RigidBody3D, KinematicBody3D, etc. to give them a shape."); + if (!warning.empty()) { + warning += "\n\n"; + } + warning += TTR("CollisionShape3D only serves to provide a collision shape to a CollisionObject3D derived node. Please only use it as a child of Area3D, StaticBody3D, RigidBody3D, KinematicBody3D, etc. to give them a shape."); } if (!shape.is_valid()) { - return TTR("A shape must be provided for CollisionShape3D to function. Please create a shape resource for it."); + if (!warning.empty()) { + warning += "\n\n"; + } + warning += TTR("A shape must be provided for CollisionShape3D to function. Please create a shape resource for it."); } if (Object::cast_to<RigidBody3D>(get_parent())) { if (Object::cast_to<ConcavePolygonShape3D>(*shape)) { if (Object::cast_to<RigidBody3D>(get_parent())->get_mode() != RigidBody3D::MODE_STATIC) { - return TTR("ConcavePolygonShape3D doesn't support RigidBody3D in another mode than static."); + if (!warning.empty()) { + warning += "\n\n"; + } + warning += TTR("ConcavePolygonShape3D doesn't support RigidBody3D in another mode than static."); } } } - return String(); + return warning; } void CollisionShape3D::_bind_methods() { |