Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix ghash assert during BGE libload.

Browse Source 
The assert message was caused by the multi call of BLO_library_append_begin in KX_BlenderSceneConverter::LinkBlendFile.
This commit is contained in:
Porteries Tristan
2015-05-02 18:02:19 +02:00
parent 2c72edc7f1
commit 8e4ac2d229
1 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -922,14 +922,9 @@ KX_LibLoadStatus *KX_BlenderSceneConverter::LinkBlendFilePath(const char *filepa
return LinkBlendFile(bpy_openlib, filepath, group, scene_merge, err_str, options); return LinkBlendFile(bpy_openlib, filepath, group, scene_merge, err_str, options);
} }
static void load_datablocks(Main *main_newlib, BlendHandle *bpy_openlib, const char *path, int idcode) static void load_datablocks(Main *main_tmp, BlendHandle *bpy_openlib, const char *path, int idcode)
{ {
Main *main_tmp= NULL; /* created only for linking, then freed */
LinkNode *names = NULL; LinkNode *names = NULL;
short flag= 0; /* don't need any special options */
/* here appending/linking starts */
main_tmp = BLO_library_append_begin(main_newlib, &bpy_openlib, (char *)path);
int totnames_dummy; int totnames_dummy;
names = BLO_blendhandle_get_datablock_names( bpy_openlib, idcode, &totnames_dummy); names = BLO_blendhandle_get_datablock_names( bpy_openlib, idcode, &totnames_dummy);
@@ -942,8 +937,6 @@ static void load_datablocks(Main *main_newlib, BlendHandle *bpy_openlib, const c
i++; i++;
} }
BLI_linklist_free(names, free); /* free linklist *and* each node's data */ BLI_linklist_free(names, free); /* free linklist *and* each node's data */
BLO_library_append_end(NULL, main_tmp, &bpy_openlib, idcode, flag);
} }
KX_LibLoadStatus *KX_BlenderSceneConverter::LinkBlendFile(BlendHandle *bpy_openlib, const char *path, char *group, KX_Scene *scene_merge, char **err_str, short options) KX_LibLoadStatus *KX_BlenderSceneConverter::LinkBlendFile(BlendHandle *bpy_openlib, const char *path, char *group, KX_Scene *scene_merge, char **err_str, short options)
@@ -981,17 +974,23 @@ KX_LibLoadStatus *KX_BlenderSceneConverter::LinkBlendFile(BlendHandle *bpy_openl
main_newlib = BKE_main_new(); main_newlib = BKE_main_new();
BKE_reports_init(&reports, RPT_STORE); BKE_reports_init(&reports, RPT_STORE);
load_datablocks(main_newlib, bpy_openlib, path, idcode); short flag = 0; /* don't need any special options */
/* created only for linking, then freed */
Main *main_tmp = BLO_library_append_begin(main_newlib, &bpy_openlib, (char *)path);
load_datablocks(main_tmp, bpy_openlib, path, idcode);
if (idcode==ID_SCE && options & LIB_LOAD_LOAD_SCRIPTS) { if (idcode==ID_SCE && options & LIB_LOAD_LOAD_SCRIPTS) {
load_datablocks(main_newlib, bpy_openlib, path, ID_TXT); load_datablocks(main_tmp, bpy_openlib, path, ID_TXT);
} }
/* now do another round of linking for Scenes so all actions are properly loaded */ /* now do another round of linking for Scenes so all actions are properly loaded */
if (idcode==ID_SCE && options & LIB_LOAD_LOAD_ACTIONS) { if (idcode==ID_SCE && options & LIB_LOAD_LOAD_ACTIONS) {
load_datablocks(main_newlib, bpy_openlib, path, ID_AC); load_datablocks(main_tmp, bpy_openlib, path, ID_AC);
} }
BLO_library_append_end(NULL, main_tmp, &bpy_openlib, idcode, flag);
BLO_blendhandle_close(bpy_openlib); BLO_blendhandle_close(bpy_openlib);
BKE_reports_clear(&reports); BKE_reports_clear(&reports);