Merge remote-tracking branch 'bp/master'

2017-05-08 09:08:50 -07:00
parent a69442d119 67392b85d5
commit 18dbf6f018
6 changed files with 86 additions and 75 deletions
--- a/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.h
+++ b/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.h
@@ -260,7 +260,7 @@ public:

 	inline int getSolveSwingLimit()
 	{
-		return m_solveTwistLimit;
+		return m_solveSwingLimit;
 	}

 	inline btScalar getTwistLimitSign()