Przeglądaj źródła

SpaceBullet::recover_from_penetration: skip compound shapes without child shapes

Before, this case would incorrectly get caught as an error, causing an
early return, in particular skipping other possibly relevant shapes.
Ricardo Buring 3 lat temu
rodzic
commit
887a5cd4f9
1 zmienionych plików z 3 dodań i 0 usunięć
  1. 3 0
      modules/bullet/space_bullet.cpp

+ 3 - 0
modules/bullet/space_bullet.cpp

@@ -1256,6 +1256,9 @@ bool SpaceBullet::recover_from_penetration(RigidBodyBullet *p_body, const btTran
 
 			if (otherObject->getCollisionShape()->isCompound()) {
 				const btCompoundShape *cs = static_cast<const btCompoundShape *>(otherObject->getCollisionShape());
+				if (cs->getNumChildShapes() == 0) {
+					continue; // No shapes to depenetrate from.
+				}
 				int shape_idx = recover_broad_result.results[i].compound_child_index;
 				ERR_FAIL_COND_V(shape_idx < 0 || shape_idx >= cs->getNumChildShapes(), false);