kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Fixing a crash when dynamically loading a scene that contains a bone parent.

Browse Source
This commit is contained in:
Mitchell Stokes 2010-11-19 04:06:06 +00:00
parent d4a2972a21
commit 844e63f3b6
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1722,6 +1722,11 @@ static void MergeScene_GameObject(KX_GameObject* gameobj, KX_Scene *to, KX_Scene
if(sg) {
if(sg->GetSGClientInfo() == from) {
sg->SetSGClientInfo(to);
/* Make sure to grab the children too since they might not be tied to a game object */
NodeList children = sg->GetSGChildren();
for (int i=0; i<children.size(); i++)
children[i]->SetSGClientInfo(to);
}
#ifdef USE_BULLET
SGControllerList::iterator contit;