Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMitchell Stokes <mogurijin@gmail.com>2012-08-27 03:17:50 +0400
committerMitchell Stokes <mogurijin@gmail.com>2012-08-27 03:17:50 +0400
commitb78b1924f3999bdc365984431f8f3ecf16ef4d1a (patch)
treea92499a86c3d9550417a3a6c2fd303ed0c165039 /source/gameengine
parentc68890cb870477091db35ce2092121dc24548c1e (diff)
BGE: Make sure lib loaded cameras are added to the active scene's camera list.
Diffstat (limited to 'source/gameengine')
-rw-r--r--source/gameengine/Ketsji/KX_Scene.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/source/gameengine/Ketsji/KX_Scene.cpp b/source/gameengine/Ketsji/KX_Scene.cpp
index 5d4b9ae40c2..f9fa0ae65f1 100644
--- a/source/gameengine/Ketsji/KX_Scene.cpp
+++ b/source/gameengine/Ketsji/KX_Scene.cpp
@@ -1825,6 +1825,9 @@ static void MergeScene_GameObject(KX_GameObject* gameobj, KX_Scene *to, KX_Scene
if (gameobj->GetGameObjectType() == SCA_IObject::OBJ_LIGHT)
((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 */
to->GetLogicManager()->RegisterGameObjectName(gameobj->GetName(), gameobj);
to->GetLogicManager()->RegisterGameObj(gameobj->GetBlenderObject(), gameobj);