浏览代码

Merge pull request #1362 from Azaezel/BulletBreak2

Removes fatal assertion on duplicated object collisions (meshroads, primarily)
Daniel Buckmaster 10 年之前
父节点
当前提交
0ed74bc8f5
共有 1 个文件被更改,包括 2 次插入3 次删除
  1. 2 3
      Engine/source/T3D/physics/bullet/btPlayer.cpp

+ 2 - 3
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;