summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErwin Coumans <erwin.coumans@gmail.com>2022-01-02 21:05:07 -0800
committerErwin Coumans <erwin.coumans@gmail.com>2022-01-02 21:05:07 -0800
commit5d1c8a2ecef76e98ee9dec5e80ff746f36a444bd (patch)
tree4e27cc43e3520a11850bb82f4b9925511b46d62e
parent0ab3b9d9f726443de841e0d169cab6eb0a9a85dd (diff)
downloadbullet3-5d1c8a2ecef76e98ee9dec5e80ff746f36a444bd.tar.gz
move the mutex lock to include the 'getNewManifold', dealing with Issue #4117
-rw-r--r--src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp b/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp
index fb15ae31e..9e99c154f 100644
--- a/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp
+++ b/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp
@@ -902,8 +902,8 @@ void btDiscreteDynamicsWorld::createPredictiveContactsInternal(btRigidBody** bod
btVector3 distVec = (predictedTrans.getOrigin() - body->getWorldTransform().getOrigin()) * sweepResults.m_closestHitFraction;
btScalar distance = distVec.dot(-sweepResults.m_hitNormalWorld);
- btPersistentManifold* manifold = m_dispatcher1->getNewManifold(body, sweepResults.m_hitCollisionObject);
btMutexLock(&m_predictiveManifoldsMutex);
+ btPersistentManifold* manifold = m_dispatcher1->getNewManifold(body, sweepResults.m_hitCollisionObject);
m_predictiveManifolds.push_back(manifold);
btMutexUnlock(&m_predictiveManifoldsMutex);