diff --git a/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.h b/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.h index 542ea23c9..2b88e25be 100644 --- a/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.h +++ b/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.h @@ -80,11 +80,11 @@ struct btSISolverSingleIterationData m_orderNonContactConstraintPool(orderNonContactConstraintPool), m_orderFrictionConstraintPool(orderFrictionConstraintPool), m_tmpConstraintSizesPool(tmpConstraintSizesPool), + m_seed(seed), m_resolveSingleConstraintRowGeneric(resolveSingleConstraintRowGeneric), m_resolveSingleConstraintRowLowerLimit(resolveSingleConstraintRowLowerLimit), m_resolveSplitPenetrationImpulse(resolveSplitPenetrationImpulse), m_kinematicBodyUniqueIdToSolverBodyTable(kinematicBodyUniqueIdToSolverBodyTable), - m_seed(seed), m_fixedBodyId(fixedBodyId), m_maxOverrideNumSolverIterations(maxOverrideNumSolverIterations) { @@ -320,4 +320,4 @@ public: btSolverAnalyticsData m_analyticsData; }; -#endif //BT_SEQUENTIAL_IMPULSE_CONSTRAINT_SOLVER_H \ No newline at end of file +#endif //BT_SEQUENTIAL_IMPULSE_CONSTRAINT_SOLVER_H diff --git a/src/LinearMath/TaskScheduler/btThreadSupportPosix.cpp b/src/LinearMath/TaskScheduler/btThreadSupportPosix.cpp index d80af09c7..a03f6dc57 100644 --- a/src/LinearMath/TaskScheduler/btThreadSupportPosix.cpp +++ b/src/LinearMath/TaskScheduler/btThreadSupportPosix.cpp @@ -304,8 +304,8 @@ void btThreadSupportPosix::stopThreads() checkPThreadFunction(sem_post(threadStatus.startSemaphore)); checkPThreadFunction(sem_wait(m_mainSemaphore)); - destroySem(threadStatus.startSemaphore); checkPThreadFunction(pthread_join(threadStatus.thread, 0)); + destroySem(threadStatus.startSemaphore); } destroySem(m_mainSemaphore); m_activeThreadStatus.clear();