Merge pull request #34225 from madmiraal/fix-34210

Add check for zero length motion at beginning of each sweep test loop in SpaceBullet::test_body_motion
godotengine · Jan 11, 2020 · 0b18527 · 0b18527
2 parents 0ab1726 + e0d2523
commit 0b18527
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/modules/bullet/space_bullet.cpp b/modules/bullet/space_bullet.cpp
@@ -945,7 +945,7 @@ bool SpaceBullet::test_body_motion(RigidBodyBullet *p_body, const Transform &p_f
 
 	btVector3 motion;
 	G_TO_B(p_motion, motion);
-	if (!motion.fuzzyZero()) {
+	{
 		// Phase two - sweep test, from a secure position without margin
 
 		const int shape_count(p_body->get_shape_count());
@@ -960,7 +960,7 @@ bool SpaceBullet::test_body_motion(RigidBodyBullet *p_body, const Transform &p_f
 		motionVec->end();
 #endif
 
-		for (int shIndex = 0; shIndex < shape_count; ++shIndex) {
+		for (int shIndex = 0; shIndex < shape_count && !motion.fuzzyZero(); ++shIndex) {
 			if (p_body->is_shape_disabled(shIndex)) {
 				continue;
 			}