[Bf-blender-cvs] [1575123] master: BGE: Fix compound child shape added on instance game object

[Porteries Tristan]

Commit: 15751238d5d9cf7868c131f09b224f5c41b518f3
Author: Porteries Tristan
Date:   Wed May 6 14:21:39 2015 +0200
Branches: master
https://developer.blender.org/rB15751238d5d9cf7868c131f09b224f5c41b518f3

BGE: Fix compound child shape added on instance game object

===================================================================

M	source/gameengine/Physics/Bullet/CcdPhysicsController.cpp

===================================================================

diff --git a/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp b/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
index 3ed01a4..dfcad86 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