diff options
| author | Erwin Coumans <blender@erwincoumans.com> | 2008-10-14 10:14:25 +0400 |
|---|---|---|
| committer | Erwin Coumans <blender@erwincoumans.com> | 2008-10-14 10:14:25 +0400 |
| commit | c51539506798fdf3f98337f03bdc018c70a5b845 (patch) | |
| tree | 7327c6955c92fecbfc75593277dfbad7b8b09b5d /extern/bullet2/src/BulletDynamics/ConstraintSolver | |
| parent | f02f9841427e03a7cf9b0c838ce7e51fa9d43f83 (diff) | |
bugfix: copy/paste bug merged from Bullet main repo into Blender, hope it still can make 2.48
Diffstat (limited to 'extern/bullet2/src/BulletDynamics/ConstraintSolver')
| -rw-r--r-- | extern/bullet2/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp index 2911d52e5ea..41e336c9d17 100644 --- a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp +++ b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp @@ -1015,7 +1015,7 @@ btScalar btSequentialImpulseConstraintSolver::solveGroupCacheFriendly(btCollisio btAssert(pt); pt->m_appliedImpulse = solveManifold.m_appliedImpulse; pt->m_appliedImpulseLateral1 = m_tmpSolverFrictionConstraintPool[solveManifold.m_frictionIndex].m_appliedImpulse; - pt->m_appliedImpulseLateral1 = m_tmpSolverFrictionConstraintPool[solveManifold.m_frictionIndex+1].m_appliedImpulse; + pt->m_appliedImpulseLateral2 = m_tmpSolverFrictionConstraintPool[solveManifold.m_frictionIndex+1].m_appliedImpulse; //do a callback here? |