blender
/
blender
134
402
Fork 585
Code Issues 6.3k Pull Requests 759 Projects 19 Wiki Activity

BGE: Fix compound child shape added on instance game object

This commit is contained in:
Porteries Tristan 2015-05-06 14:21:39 +02:00
parent df422314c1
commit 15751238d5
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
View File

@ -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