From 74a194a27795356f902bdbbaa3f57516675cc8c2 Mon Sep 17 00:00:00 2001 From: Azaezel Date: Sat, 14 Nov 2015 11:26:42 -0600 Subject: [PATCH] missed a convexSweepTest early-out check. --- Engine/source/T3D/physics/bullet/btPlayer.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Engine/source/T3D/physics/bullet/btPlayer.cpp b/Engine/source/T3D/physics/bullet/btPlayer.cpp index c7625e2bb..6e22b0cf8 100644 --- a/Engine/source/T3D/physics/bullet/btPlayer.cpp +++ b/Engine/source/T3D/physics/bullet/btPlayer.cpp @@ -341,7 +341,8 @@ void BtPlayer::_stepForward( btVector3 *inOutCurrPos, const btVector3 &displacem callback.m_collisionFilterGroup = mGhostObject->getBroadphaseHandle()->m_collisionFilterGroup; callback.m_collisionFilterMask = mGhostObject->getBroadphaseHandle()->m_collisionFilterMask; - mGhostObject->convexSweepTest( mColShape, start, end, callback, 0.0f ); + if (disp.length()>0.0001) + mGhostObject->convexSweepTest( mColShape, start, end, callback, 0.0f ); // Subtract from the travel fraction. fraction -= callback.m_closestHitFraction;