TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-13 15:44:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge pull request #1362 from Azaezel/BulletBreak2

Browse source 
Removes fatal assertion on duplicated object collisions (meshroads, primarily)
This commit is contained in:
Daniel Buckmaster 2015-07-26 09:41:10 +10:00
commit 0ed74bc8f5
1 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Engine/source/T3D/physics/bullet/btPlayer.cpp
View file

@ -434,9 +434,8 @@ void BtPlayer::findContact( SceneObject **contactObject,
if ( other == mGhostObject ) if ( other == mGhostObject )
other = (btCollisionObject*)pair.m_pProxy1->m_clientObject; other = (btCollisionObject*)pair.m_pProxy1->m_clientObject;
AssertFatal( !outOverlapObjects->contains( PhysicsUserData::getObject( other->getUserPointer() ) ), if (!outOverlapObjects->contains(PhysicsUserData::getObject(other->getUserPointer())))
"Got multiple pairs of the same object!" ); outOverlapObjects->push_back( PhysicsUserData::getObject( other->getUserPointer() ) );
outOverlapObjects->push_back( PhysicsUserData::getObject( other->getUserPointer() ) );
if ( other->getCollisionFlags() & btCollisionObject::CF_NO_CONTACT_RESPONSE ) if ( other->getCollisionFlags() & btCollisionObject::CF_NO_CONTACT_RESPONSE )
continue; continue;