forked from bartvdbraak/blender
bge builds again without bullet.
This commit is contained in:
parent
4a99d30538
commit
9e2beaa1e2
@ -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();
|
||||
|
Loading…
Reference in New Issue
Block a user