diff options
author | Campbell Barton <ideasman42@gmail.com> | 2013-11-05 10:19:19 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2013-11-05 10:19:19 +0400 |
commit | 9e2beaa1e2149df660594bcf4375a3b125297395 (patch) | |
tree | dec93bfb3ede9780c6e7a6986ba2ec71500bee14 /source/gameengine/Ketsji | |
parent | 4a99d30538a70b95a2d6cdbf22434aefe5329a10 (diff) |
bge builds again without bullet.
Diffstat (limited to 'source/gameengine/Ketsji')
-rw-r--r-- | source/gameengine/Ketsji/KX_Scene.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/source/gameengine/Ketsji/KX_Scene.cpp b/source/gameengine/Ketsji/KX_Scene.cpp index 2cddb073b41..c3d7d3179b6 100644 --- a/source/gameengine/Ketsji/KX_Scene.cpp +++ b/source/gameengine/Ketsji/KX_Scene.cpp @@ -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(); |