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:
authorPorteries Tristan <republicthunderbolt9@gmail.com>2015-07-02 12:56:49 +0300
committerPorteries Tristan <republicthunderbolt9@gmail.com>2015-07-02 12:56:49 +0300
commite80e4c937bd20132bec52181dfa16be6883b5802 (patch)
tree0e72fae40ca3f72e767061d58072b1c42e89df69 /source/gameengine/Ketsji/KX_Scene.cpp
parent13936951450fe78c7c4dfd2b9b591f598fd293ed (diff)
BGE: Fix T45196 armature action on libloading.
Diffstat (limited to 'source/gameengine/Ketsji/KX_Scene.cpp')
-rw-r--r--source/gameengine/Ketsji/KX_Scene.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/source/gameengine/Ketsji/KX_Scene.cpp b/source/gameengine/Ketsji/KX_Scene.cpp
index d3ee219b2f4..3a596548cfa 100644
--- a/source/gameengine/Ketsji/KX_Scene.cpp
+++ b/source/gameengine/Ketsji/KX_Scene.cpp
@@ -1994,6 +1994,10 @@ static void MergeScene_GameObject(KX_GameObject* gameobj, KX_Scene *to, KX_Scene
if (gameobj->GetGameObjectType() == SCA_IObject::OBJ_CAMERA)
to->AddCamera((KX_Camera*)gameobj);
+ // All armatures should be in the animated object list to be umpdated.
+ if (gameobj->GetGameObjectType() == SCA_IObject::OBJ_ARMATURE)
+ to->AddAnimatedObject(gameobj);
+
/* Add the object to the scene's logic manager */
to->GetLogicManager()->RegisterGameObjectName(gameobj->GetName(), gameobj);
to->GetLogicManager()->RegisterGameObj(gameobj->GetBlenderObject(), gameobj);