griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

BGE: Fix T45196 armature action on libloading.

Browse Source
This commit is contained in:
Porteries Tristan
2015-07-02 11:56:49 +02:00
parent 1393695145
commit e80e4c937b
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/gameengine/Ketsji/KX_Scene.cpp
View File

@@ -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);