Browse Source

Merge pull request #17804 from RandomShaper/fix-orphan-collider-crash-2.1

Add null check to CollisionPolygon2D
Rémi Verschelde 7 years ago
parent
commit
298548df4e
1 changed files with 4 additions and 2 deletions
  1. 4 2
      scene/2d/collision_polygon_2d.cpp

+ 4 - 2
scene/2d/collision_polygon_2d.cpp

@@ -98,8 +98,10 @@ void CollisionPolygon2D::_update_xform_in_parent() {
 
 	if (shape_from >= 0 && shape_to >= 0) {
 		CollisionObject2D *co = get_parent()->cast_to<CollisionObject2D>();
-		for (int i = shape_from; i <= shape_to; i++) {
-			co->set_shape_transform(i, get_transform());
+		if (co) {
+			for (int i = shape_from; i <= shape_to; i++) {
+				co->set_shape_transform(i, get_transform());
+			}
 		}
 	}
 }