From aa8200317434e6867d63e870a8d1cd3819e79353 Mon Sep 17 00:00:00 2001 From: erwincoumans Date: Wed, 29 Nov 2017 10:53:29 -0800 Subject: [PATCH] Update btMultiBodyConstraintSolver.h --- src/BulletDynamics/Featherstone/btMultiBodyConstraintSolver.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/BulletDynamics/Featherstone/btMultiBodyConstraintSolver.h b/src/BulletDynamics/Featherstone/btMultiBodyConstraintSolver.h index 99b344e29..54ddcbfd0 100644 --- a/src/BulletDynamics/Featherstone/btMultiBodyConstraintSolver.h +++ b/src/BulletDynamics/Featherstone/btMultiBodyConstraintSolver.h @@ -47,7 +47,7 @@ protected: btScalar resolveSingleConstraintRowGeneric(const btMultiBodySolverConstraint& c); //solve 2 friction directions and clamp against the implicit friction cone - btScalar resolveConeFrictionConstraintRows(const btMultiBodySolverConstraint& cA, const btMultiBodySolverConstraint& cB); + btScalar resolveConeFrictionConstraintRows(const btMultiBodySolverConstraint& cA1, const btMultiBodySolverConstraint& cB); void convertContacts(btPersistentManifold** manifoldPtr,int numManifolds, const btContactSolverInfo& infoGlobal);