diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2018-09-07 15:09:02 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-07 15:09:02 -0300 |
| commit | ec4b8e4a5a96457ef5f88f87205363b86b7c7615 (patch) | |
| tree | 7a984cec670365b967671afdccb4de41aaad4c5b /thirdparty/bullet/BulletCollision/BroadphaseCollision/btSimpleBroadphase.cpp | |
| parent | 6ce9951d9e487cfacec40ea27e2a2be241d9da77 (diff) | |
| parent | 6142448417f4e15bf0bc0c94df7d1862a790e3c7 (diff) | |
Merge pull request #21836 from AndreaCatania/bulletUpdate
Update bullet to Master 12409f1118a7c7a266f9071350c70789dfe73bb9
Diffstat (limited to 'thirdparty/bullet/BulletCollision/BroadphaseCollision/btSimpleBroadphase.cpp')
| -rw-r--r-- | thirdparty/bullet/BulletCollision/BroadphaseCollision/btSimpleBroadphase.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/thirdparty/bullet/BulletCollision/BroadphaseCollision/btSimpleBroadphase.cpp b/thirdparty/bullet/BulletCollision/BroadphaseCollision/btSimpleBroadphase.cpp index f1d5f5476e..5f89f960e8 100644 --- a/thirdparty/bullet/BulletCollision/BroadphaseCollision/btSimpleBroadphase.cpp +++ b/thirdparty/bullet/BulletCollision/BroadphaseCollision/btSimpleBroadphase.cpp @@ -24,8 +24,6 @@ subject to the following restrictions: #include <new> -extern int gOverlappingPairs; - void btSimpleBroadphase::validate() { for (int i=0;i<m_numHandles;i++) @@ -315,8 +313,7 @@ void btSimpleBroadphase::calculateOverlappingPairs(btDispatcher* dispatcher) pair.m_pProxy0 = 0; pair.m_pProxy1 = 0; m_invalidPair++; - gOverlappingPairs--; - } + } } |