diff options
author | Sergej Reich <sergej.reich@googlemail.com> | 2013-12-26 15:41:52 +0400 |
---|---|---|
committer | Sergej Reich <sergej.reich@googlemail.com> | 2013-12-26 15:45:57 +0400 |
commit | 05eebf49d3c3af47bf157207b82cf559ac1fe274 (patch) | |
tree | d1f82266237e929e6cc19aac3dd001a32ee7d052 /extern/bullet2/src/BulletSoftBody | |
parent | 709041ed0b7e1848068c9d53543ed114229a9f5b (diff) |
Bullet: Update to svn r2719
Fixes part of T37905, fixed constraint didn't work correctly.
Diffstat (limited to 'extern/bullet2/src/BulletSoftBody')
-rw-r--r-- | extern/bullet2/src/BulletSoftBody/btSoftBody.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/extern/bullet2/src/BulletSoftBody/btSoftBody.cpp b/extern/bullet2/src/BulletSoftBody/btSoftBody.cpp index 9429d56e05a..2bfd62f2a2f 100644 --- a/extern/bullet2/src/BulletSoftBody/btSoftBody.cpp +++ b/extern/bullet2/src/BulletSoftBody/btSoftBody.cpp @@ -3027,7 +3027,8 @@ void btSoftBody::PSolve_RContacts(btSoftBody* psb, btScalar kst, btScalar ti) { const RContact& c = psb->m_rcontacts[i]; const sCti& cti = c.m_cti; - if (cti.m_colObj->hasContactResponse()) { + if (cti.m_colObj->hasContactResponse()) + { btRigidBody* tmpRigid = (btRigidBody*)btRigidBody::upcast(cti.m_colObj); const btVector3 va = tmpRigid ? tmpRigid->getVelocityInLocalPoint(c.m_c1)*dt : btVector3(0,0,0); const btVector3 vb = c.m_node->m_x-c.m_node->m_q; |