Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'bp/master'

Browse Source
This commit is contained in:
Erwin Coumans
2018-11-21 16:44:04 -08:00
parent 121cdc91b0 f2a98777e7
commit 5bdfece800
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/BulletDynamics/Dynamics/btDiscreteDynamicsWorldMt.cpp
View File

@@ -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)
{

2
src/BulletDynamics/Dynamics/btDiscreteDynamicsWorldMt.h
View File

@@ -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();