godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix crash on debug shapes update if CollisionObject is not in tree

Browse Source 
Also fix ConcavePolygonShape not emitting the changed signal

(cherry picked from commit 7043d6d1c6)
This commit is contained in:
trollodel 2021-05-22 17:33:51 +02:00 committed by Rémi Verschelde
parent 20dfa4ceaa
commit 5b8b3f645e
No known key found for this signature in database
GPG Key ID: C3336907360768E1
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
scene/3d/collision_object.cpp
View File

@ -160,6 +160,11 @@ void CollisionObject::_shape_changed(const Ref<Shape> &p_shape) {
} }
void CollisionObject::_update_debug_shapes() { void CollisionObject::_update_debug_shapes() {
if (!is_inside_tree()) {
debug_shapes_to_update.clear();
return;
}
for (Set<uint32_t>::Element *shapedata_idx = debug_shapes_to_update.front(); shapedata_idx; shapedata_idx = shapedata_idx->next()) { for (Set<uint32_t>::Element *shapedata_idx = debug_shapes_to_update.front(); shapedata_idx; shapedata_idx = shapedata_idx->next()) {
if (shapes.has(shapedata_idx->get())) { if (shapes.has(shapedata_idx->get())) {
ShapeData &shapedata = shapes[shapedata_idx->get()]; ShapeData &shapedata = shapes[shapedata_idx->get()];

1
scene/resources/concave_polygon_shape.cpp
View File

@ -71,6 +71,7 @@ void ConcavePolygonShape::_update_shape() {
void ConcavePolygonShape::set_faces(const PoolVector<Vector3> &p_faces) { void ConcavePolygonShape::set_faces(const PoolVector<Vector3> &p_faces) {
PhysicsServer::get_singleton()->shape_set_data(get_shape(), p_faces); PhysicsServer::get_singleton()->shape_set_data(get_shape(), p_faces);
_update_shape();
notify_change_to_owners(); notify_change_to_owners();
} }