From b39f47eab148a5fe04e7184b4a44e339604ef5a5 Mon Sep 17 00:00:00 2001
From: stolk <b.stolk@gmail.com>
Date: Thu, 15 Nov 2018 14:48:43 -0800
Subject: [PATCH] Change confusing variable name in btDiscreteDynamicsWorldMT
 API.

---
 src/BulletDynamics/Dynamics/btDiscreteDynamicsWorldMt.cpp | 4 ++--
 src/BulletDynamics/Dynamics/btDiscreteDynamicsWorldMt.h   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorldMt.cpp b/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorldMt.cpp
index d5805ad9b..8207b4713 100644
--- a/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorldMt.cpp
+++ b/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorldMt.cpp
@@ -147,10 +147,10 @@ void btConstraintSolverPoolMt::reset()
 
 btDiscreteDynamicsWorldMt::btDiscreteDynamicsWorldMt(btDispatcher* dispatcher,
 													 btBroadphaseInterface* pairCache,
-													 btConstraintSolverPoolMt* constraintSolver,
+													 btConstraintSolverPoolMt* solverPool,
 													 btConstraintSolver* constraintSolverMt,
 													 btCollisionConfiguration* collisionConfiguration)
-	: btDiscreteDynamicsWorld(dispatcher, pairCache, constraintSolver, collisionConfiguration)
+	: btDiscreteDynamicsWorld(dispatcher, pairCache, solverPool, collisionConfiguration)
 {
 	if (m_ownsIslandManager)
 	{
diff --git a/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorldMt.h b/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorldMt.h
index 58d808923..dccf35d7a 100644
--- a/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorldMt.h
+++ b/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorldMt.h
@@ -120,7 +120,7 @@ public:
 
 	btDiscreteDynamicsWorldMt(btDispatcher * dispatcher,
 							  btBroadphaseInterface * pairCache,
-							  btConstraintSolverPoolMt * constraintSolver,  // Note this should be a solver-pool for multi-threading
+							  btConstraintSolverPoolMt * solverPool,        // Note this should be a solver-pool for multi-threading
 							  btConstraintSolver * constraintSolverMt,      // single multi-threaded solver for large islands (or NULL)
 							  btCollisionConfiguration * collisionConfiguration);
 	virtual ~btDiscreteDynamicsWorldMt();