Browse Source

Check for the use of an empty shape in Bullet Kinematic collisions

(cherry picked from commit ff9a6c4e39b53269f7c6274994dee4f1bff29dbd)
Marcel Admiraal 4 years ago
parent
commit
1e28e234c5
1 changed files with 4 additions and 0 deletions
  1. 4 0
      modules/bullet/space_bullet.cpp

+ 4 - 0
modules/bullet/space_bullet.cpp

@@ -1273,6 +1273,10 @@ bool SpaceBullet::recover_from_penetration(RigidBodyBullet *p_body, const btTran
 			continue;
 		}
 
+		if (kin_shape.shape->getShapeType() == EMPTY_SHAPE_PROXYTYPE) {
+			continue;
+		}
+
 		btTransform shape_transform = p_body_position * kin_shape.transform;
 		shape_transform.getOrigin() += r_delta_recover_movement;