bge builds again without bullet.
authorCampbell Barton <ideasman42@gmail.com>
Tue, 5 Nov 2013 06:19:19 +0000 (06:19 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 5 Nov 2013 06:19:19 +0000 (06:19 +0000)
source/gameengine/Ketsji/KX_Scene.cpp

index 2cddb073b41499ddcb50568071335d5aaac1b35b..c3d7d3179b6410ef749ed0708ad4e5897cdfd0d2 100644 (file)
@@ -562,6 +562,7 @@ KX_GameObject* KX_Scene::AddNodeReplicaObject(class SG_IObject* node, class CVal
                newobj->SetGraphicController(newctrl);
        }
 
+#ifdef WITH_BULLET
        // replicate physics controller
        if (orgobj->GetPhysicsController())
        {
@@ -578,6 +579,8 @@ KX_GameObject* KX_Scene::AddNodeReplicaObject(class SG_IObject* node, class CVal
                if (parent)
                        parent->Release();
        }
+#endif
+
        return newobj;
 }
 
@@ -1905,10 +1908,12 @@ static void MergeScene_GameObject(KX_GameObject* gameobj, KX_Scene *to, KX_Scene
                ctrl->SetPhysicsEnvironment(to->GetPhysicsEnvironment());
        }
 
+#ifdef WITH_BULLET
        ctrl = gameobj->GetPhysicsController();
        if (ctrl) {
                ctrl->SetPhysicsEnvironment(to->GetPhysicsEnvironment());
        }
+#endif
 
        /* SG_Node can hold a scene reference */
        SG_Node *sg= gameobj->GetSGNode();