From c51539506798fdf3f98337f03bdc018c70a5b845 Mon Sep 17 00:00:00 2001 From: Erwin Coumans Date: Tue, 14 Oct 2008 06:14:25 +0000 Subject: bugfix: copy/paste bug merged from Bullet main repo into Blender, hope it still can make 2.48 --- .../ConstraintSolver/btSequentialImpulseConstraintSolver.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'extern/bullet2/src') 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? -- cgit v1.2.3