Merge remote-tracking branch 'origin/master'

10 years ago · 53c3df16e5
parent 8e35ad54bd 60fffec345
commit 53c3df16e5
1 changed files with 1 additions and 1 deletions
--- a/libs/openengine/bullet/physic.cpp
+++ b/libs/openengine/bullet/physic.cpp
@ -480,7 +480,7 @@ namespace Physic
 //#endif

        bool needDelete = false;
-        if (btBvhTriangleMeshShape* triangleShape = dynamic_cast<btBvhTriangleMeshShape*>(shape->mCollisionShape))
+        if (btBvhTriangleMeshShape* triangleShape = dynamic_cast<btBvhTriangleMeshShape*>(collisionShape))
        {
            btScaledBvhTriangleMeshShape* scaled = new btScaledBvhTriangleMeshShape(triangleShape, btVector3(scale,scale,scale));
            collisionShape = scaled;