From e80e4c937bd20132bec52181dfa16be6883b5802 Mon Sep 17 00:00:00 2001 From: Porteries Tristan Date: Thu, 2 Jul 2015 11:56:49 +0200 Subject: BGE: Fix T45196 armature action on libloading. --- source/gameengine/Ketsji/KX_Scene.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'source/gameengine/Ketsji/KX_Scene.cpp') 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); -- cgit v1.2.3