Merge remote-tracking branch 'scrawl/master' into next

12 years ago · b2f6f67d53
parent 1d1471b81c 3277ef26da
commit b2f6f67d53
1 changed files with 9 additions and 1 deletions
--- a/libs/openengine/bullet/physic.cpp
+++ b/libs/openengine/bullet/physic.cpp
@ -608,6 +608,14 @@ namespace Physic
        btTransform trans;
        trans.setIdentity();

-        shape->mCollisionShape->getAabb(trans, min, max);
+        if (shape->mRaycastingShape)
+            shape->mRaycastingShape->getAabb(trans, min, max);
+        else if (shape->mCollisionShape)
+            shape->mCollisionShape->getAabb(trans, min, max);
+        else
+        {
+            min = btVector3(0,0,0);
+            max = btVector3(0,0,0);
+        }
    }
 }}