diff options
| author | Julian Eisel <eiseljulian@gmail.com> | 2016-09-08 13:16:41 +0300 |
|---|---|---|
| committer | Julian Eisel <eiseljulian@gmail.com> | 2016-09-08 13:16:41 +0300 |
| commit | 788c75ed879fb25a35c0a0e9245df7aeaae2f4ab (patch) | |
| tree | 3b1c315078e257e0401904860f9ec90fe60390ee /extern/bullet2/src/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.cpp | |
| parent | 1ffd9714b930dbef8059403d69650476f625f554 (diff) | |
| parent | 45f833c21dcfad4d1d7045987bb8b69d6aab05be (diff) | |
Merge branch 'master' into viewport_bvh_selectviewport_bvh_select
Diffstat (limited to 'extern/bullet2/src/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.cpp')
| -rw-r--r-- | extern/bullet2/src/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/extern/bullet2/src/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.cpp b/extern/bullet2/src/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.cpp index a80c438d12a..589a7f55f2b 100644 --- a/extern/bullet2/src/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.cpp +++ b/extern/bullet2/src/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.cpp @@ -232,8 +232,8 @@ void btCompoundCollisionAlgorithm::processCollision (const btCollisionObjectWrap m_compoundShapeRevision = compoundShape->getUpdateRevision(); } - if (m_childCollisionAlgorithms.size()==0) - return; + if (m_childCollisionAlgorithms.size()==0) + return; const btDbvt* tree = compoundShape->getDynamicAabbTree(); //use a dynamic aabb tree to cull potential child-overlaps |