[Bf-blender-cvs] [e80e4c9] master: BGE: Fix T45196 armature action on libloading.

[Porteries Tristan]

Commit: e80e4c937bd20132bec52181dfa16be6883b5802
Author: Porteries Tristan
Date:   Thu Jul 2 11:56:49 2015 +0200
Branches: master
https://developer.blender.org/rBe80e4c937bd20132bec52181dfa16be6883b5802

BGE: Fix T45196 armature action on libloading.

===================================================================

M	source/gameengine/Ketsji/KX_Scene.cpp

===================================================================

diff --git a/source/gameengine/Ketsji/KX_Scene.cpp b/source/gameengine/Ketsji/KX_Scene.cpp
index d3ee219..3a59654 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);