forked from bartvdbraak/blender
BGE: Make sure lib loaded cameras are added to the active scene's camera list.
This commit is contained in:
parent
c68890cb87
commit
b78b1924f3
@ -1825,6 +1825,9 @@ static void MergeScene_GameObject(KX_GameObject* gameobj, KX_Scene *to, KX_Scene
|
|||||||
if (gameobj->GetGameObjectType() == SCA_IObject::OBJ_LIGHT)
|
if (gameobj->GetGameObjectType() == SCA_IObject::OBJ_LIGHT)
|
||||||
((KX_LightObject*)gameobj)->UpdateScene(to);
|
((KX_LightObject*)gameobj)->UpdateScene(to);
|
||||||
|
|
||||||
|
if (gameobj->GetGameObjectType() == SCA_IObject::OBJ_CAMERA)
|
||||||
|
to->AddCamera((KX_Camera*)gameobj);
|
||||||
|
|
||||||
/* Add the object to the scene's logic manager */
|
/* Add the object to the scene's logic manager */
|
||||||
to->GetLogicManager()->RegisterGameObjectName(gameobj->GetName(), gameobj);
|
to->GetLogicManager()->RegisterGameObjectName(gameobj->GetName(), gameobj);
|
||||||
to->GetLogicManager()->RegisterGameObj(gameobj->GetBlenderObject(), gameobj);
|
to->GetLogicManager()->RegisterGameObj(gameobj->GetBlenderObject(), gameobj);
|
||||||
|
Loading…
Reference in New Issue
Block a user