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
2019-06-10 16:24:42 -07:00
parent 8c796a954c 5ec8339b6f
commit dc9549b2b4
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.h
View File

@@ -80,11 +80,11 @@ struct btSISolverSingleIterationData
m_orderNonContactConstraintPool(orderNonContactConstraintPool), m_orderNonContactConstraintPool(orderNonContactConstraintPool),
m_orderFrictionConstraintPool(orderFrictionConstraintPool), m_orderFrictionConstraintPool(orderFrictionConstraintPool),
m_tmpConstraintSizesPool(tmpConstraintSizesPool), m_tmpConstraintSizesPool(tmpConstraintSizesPool),
m_seed(seed),
m_resolveSingleConstraintRowGeneric(resolveSingleConstraintRowGeneric), m_resolveSingleConstraintRowGeneric(resolveSingleConstraintRowGeneric),
m_resolveSingleConstraintRowLowerLimit(resolveSingleConstraintRowLowerLimit), m_resolveSingleConstraintRowLowerLimit(resolveSingleConstraintRowLowerLimit),
m_resolveSplitPenetrationImpulse(resolveSplitPenetrationImpulse), m_resolveSplitPenetrationImpulse(resolveSplitPenetrationImpulse),
m_kinematicBodyUniqueIdToSolverBodyTable(kinematicBodyUniqueIdToSolverBodyTable), m_kinematicBodyUniqueIdToSolverBodyTable(kinematicBodyUniqueIdToSolverBodyTable),
m_seed(seed),
m_fixedBodyId(fixedBodyId), m_fixedBodyId(fixedBodyId),
m_maxOverrideNumSolverIterations(maxOverrideNumSolverIterations) m_maxOverrideNumSolverIterations(maxOverrideNumSolverIterations)
{ {
@@ -320,4 +320,4 @@ public:
btSolverAnalyticsData m_analyticsData; btSolverAnalyticsData m_analyticsData;
}; };
#endif //BT_SEQUENTIAL_IMPULSE_CONSTRAINT_SOLVER_H #endif //BT_SEQUENTIAL_IMPULSE_CONSTRAINT_SOLVER_H

2
src/LinearMath/TaskScheduler/btThreadSupportPosix.cpp
View File

@@ -304,8 +304,8 @@ void btThreadSupportPosix::stopThreads()
checkPThreadFunction(sem_post(threadStatus.startSemaphore)); checkPThreadFunction(sem_post(threadStatus.startSemaphore));
checkPThreadFunction(sem_wait(m_mainSemaphore)); checkPThreadFunction(sem_wait(m_mainSemaphore));
destroySem(threadStatus.startSemaphore);
checkPThreadFunction(pthread_join(threadStatus.thread, 0)); checkPThreadFunction(pthread_join(threadStatus.thread, 0));
destroySem(threadStatus.startSemaphore);
} }
destroySem(m_mainSemaphore); destroySem(m_mainSemaphore);
m_activeThreadStatus.clear(); m_activeThreadStatus.clear();