Merge pull request #29299 from creikey/master

Check if parent is null before updating transform
2019-05-31 09:51:05 +02:00 · 2019-05-31 09:51:05 +02:00 · 77880d1b4d
parent 4bcefb2268 9f29c28918
commit 77880d1b4d
1 changed files with 3 additions and 1 deletions
--- a/scene/3d/collision_shape.cpp
+++ b/scene/3d/collision_shape.cpp
@ -228,7 +228,9 @@ void CollisionShape::_update_debug_shape() {

 void CollisionShape::_shape_changed() {
 	// If this is a heightfield shape our center may have changed
+	if (parent) {
 		_update_in_shape_owner(true);
+	}

 	if (is_inside_tree() && get_tree()->is_debugging_collisions_hint() && !debug_shape_dirty) {
 		debug_shape_dirty = true;