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

Fixing the other crash mentioned in bug #25083. m_current_scene isn't always pointing to valid memory by the time LinkBlendFile is called. So, use the supplied scene_merge scene instead. Scene LibLoad was already doing this, so I just made Mesh and Action follow suit.

Browse Source
This commit is contained in:
Mitchell Stokes
2011-03-19 22:47:51 +00:00
parent 815a795be9
commit 35dbf67c00
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/gameengine/Converter/KX_BlenderSceneConverter.cpp
View File

@@ -1012,21 +1012,19 @@ bool KX_BlenderSceneConverter::LinkBlendFile(BlendHandle *bpy_openlib, const cha
if(idcode==ID_ME) {
/* Convert all new meshes into BGE meshes */
ID* mesh;
KX_Scene *kx_scene= m_currentScene;
for(mesh= (ID *)main_newlib->mesh.first; mesh; mesh= (ID *)mesh->next ) {
RAS_MeshObject *meshobj = BL_ConvertMesh((Mesh *)mesh, NULL, scene_merge, this);
kx_scene->GetLogicManager()->RegisterMeshName(meshobj->GetName(),meshobj);
scene_merge->GetLogicManager()->RegisterMeshName(meshobj->GetName(),meshobj);
}
}
else if(idcode==ID_AC) {
/* Convert all actions */
ID *action;
KX_Scene *kx_scene= m_currentScene;
for(action= (ID *)main_newlib->action.first; action; action= (ID *)action->next) {
printf("ActionName: %s\n", action->name);
kx_scene->GetLogicManager()->RegisterActionName(action->name+2, action);
scene_merge->GetLogicManager()->RegisterActionName(action->name+2, action);
}
}
else if(idcode==ID_SCE) {