Changeset 7983 for code/branches/kicklib/src/external/bullet/BulletCollision/BroadphaseCollision/btOverlappingPairCache.cpp

Timestamp:

Feb 27, 2011, 7:43:24 AM (14 years ago)

Author:

rgrieder

Message:

Updated Bullet Physics Engine from v2.74 to v2.77

File:

• code/branches/kicklib/src/external/bullet/BulletCollision/BroadphaseCollision/btOverlappingPairCache.cpp (modified) (2 diffs)

code/branches/kicklib/src/external/bullet/BulletCollision/BroadphaseCollision/btOverlappingPairCache.cpp

@@ -241 +241 @@
         int count = m_overlappingPairArray.size();
         int oldCapacity = m_overlappingPairArray.capacity();
-        void* mem = &m_overlappingPairArray.expand();
+        void* mem = &m_overlappingPairArray.expandNonInitializing();
 
         //this is where we add an actual pair, so also call the 'ghost'
@@ -468 +468 @@
                 return 0;
         
-        void* mem = &m_overlappingPairArray.expand();
+        void* mem = &m_overlappingPairArray.expandNonInitializing();
         btBroadphasePair* pair = new (mem) btBroadphasePair(*proxy0,*proxy1);