diff options
| author | Porteries Tristan <republicthunderbolt9@gmail.com> | 2015-05-06 15:21:39 +0300 |
|---|---|---|
| committer | Porteries Tristan <republicthunderbolt9@gmail.com> | 2015-05-06 15:23:22 +0300 |
| commit | 15751238d5d9cf7868c131f09b224f5c41b518f3 (patch) | |
| tree | 4adfcd4039439a667596cd42b5e34ce7957f119f /source/gameengine | |
| parent | df422314c10bb6ef0b33afa4d203916823efa976 (diff) | |
BGE: Fix compound child shape added on instance game object
Diffstat (limited to 'source/gameengine')
| -rw-r--r-- | source/gameengine/Physics/Bullet/CcdPhysicsController.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp b/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp index 3ed01a402ed..dfcad865e09 100644 --- a/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp +++ b/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp @@ -1576,8 +1576,7 @@ void CcdPhysicsController::AddCompoundChild(PHY_IPhysicsController* child) const btCollisionShape* childShape = childBody->getCollisionShape(); if (!rootShape || !childShape || - rootShape->getShapeType() != COMPOUND_SHAPE_PROXYTYPE || - childShape->getShapeType() == COMPOUND_SHAPE_PROXYTYPE) + rootShape->getShapeType() != COMPOUND_SHAPE_PROXYTYPE) return; btCompoundShape* compoundShape = (btCompoundShape*)rootShape; // compute relative transformation between parent and child |