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

avoid conflicts when using a unity build (single cpp file including many other cpp)

Browse Source
This commit is contained in:
erwincoumans
2019-01-23 13:35:58 -08:00
parent 0cf3f7d750
commit 93087f36df
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -65,7 +65,7 @@ inline int getIslandId(const btPersistentManifold* lhs)
return islandId;
}
SIMD_FORCE_INLINE int btGetConstraintIslandId(const btTypedConstraint* lhs)
SIMD_FORCE_INLINE int btGetConstraintIslandId1(const btTypedConstraint* lhs)
{
const btCollisionObject& rcolObj0 = lhs->getRigidBodyA();
const btCollisionObject& rcolObj1 = lhs->getRigidBodyB();
@@ -452,7 +452,7 @@ void btSimulationIslandManagerMt::addConstraintsToIslands(btAlignedObjectArray<b
btTypedConstraint* constraint = constraints[i];
if (constraint->isEnabled())
{
int islandId = btGetConstraintIslandId(constraint);
int islandId = btGetConstraintIslandId1(constraint);
// if island is not sleeping,
if (Island* island = getIsland(islandId))
{