Changeset 10053 for code/branches/modularships/src/external

Timestamp:

May 13, 2014, 11:45:47 AM (11 years ago)

Author:

noep

Message:

Fixed yet another segfault (which we hadn't seen yet).
Cleared emptyLevel, created two testlevels (testing with boxes)

File:

• code/branches/modularships/src/external/bullet/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.cpp (modified) (2 diffs)

code/branches/modularships/src/external/bullet/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.cpp

@@ -21 +21 @@
 #include "LinearMath/btAabbUtil2.h"
 #include "btManifoldResult.h"
+#include <iostream>
 
 btCompoundCollisionAlgorithm::btCompoundCollisionAlgorithm( const btCollisionAlgorithmConstructionInfo& ci,btCollisionObject* body0,btCollisionObject* body1,bool isSwapped)
@@ -115 +116 @@
         void    ProcessChildShape(btCollisionShape* childShape,int index)
         {
-                btAssert(index>=0);
+                // std::cout << "PCS: " << childShape << std::endl; // FIXME: (noep) remove DEBUG
+            btAssert(index>=0);
                 btCompoundShape* compoundShape = static_cast<btCompoundShape*>(m_compoundColObj->getCollisionShape());
                 btAssert(index<compoundShape->getNumChildShapes());