Changeset 8284 for code/branches/kicklib2/src/external/bullet/BulletCollision/BroadphaseCollision/btOverlappingPairCache.cpp

Timestamp:

Apr 21, 2011, 6:58:23 PM (14 years ago)

Author:

rgrieder

Message:

Merged revisions 7978 - 8096 from kicklib to kicklib2.

Location:

code/branches/kicklib2

Files:

• . (modified) (1 prop)
• src/external/bullet/BulletCollision/BroadphaseCollision/btOverlappingPairCache.cpp (modified) (2 diffs)

code/branches/kicklib2/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);