From e9a1d2158b4da69c27f80a986da6ee9e6c0ba565 Mon Sep 17 00:00:00 2001 From: Azaezel Date: Fri, 17 Jul 2015 14:25:01 -0500 Subject: [PATCH] BulletCrashfix2 Removes fatal assertion on duplicated object collisions (meshroads, primarily) --- Engine/source/T3D/physics/bullet/btPlayer.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Engine/source/T3D/physics/bullet/btPlayer.cpp b/Engine/source/T3D/physics/bullet/btPlayer.cpp index 307abed6a..aba7b82f5 100644 --- a/Engine/source/T3D/physics/bullet/btPlayer.cpp +++ b/Engine/source/T3D/physics/bullet/btPlayer.cpp @@ -434,9 +434,8 @@ void BtPlayer::findContact( SceneObject **contactObject, if ( other == mGhostObject ) other = (btCollisionObject*)pair.m_pProxy1->m_clientObject; - AssertFatal( !outOverlapObjects->contains( PhysicsUserData::getObject( other->getUserPointer() ) ), - "Got multiple pairs of the same object!" ); - outOverlapObjects->push_back( PhysicsUserData::getObject( other->getUserPointer() ) ); + if (!outOverlapObjects->contains(PhysicsUserData::getObject(other->getUserPointer()))) + outOverlapObjects->push_back( PhysicsUserData::getObject( other->getUserPointer() ) ); if ( other->getCollisionFlags() & btCollisionObject::CF_NO_CONTACT_RESPONSE ) continue;