From 451d5cef0f419921351e392676aa6d8a44b4cfc3 Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Fri, 16 Feb 2018 10:31:03 +0100 Subject: Fix part II of T53977: Severe problem with multiple instances of a library (save and reload). Once 'losing lib' issue is fixed (in previous commit), we have new issue that this could lead to several copies of the same linked data-block in .blend file. Which is not good. At all. So had to add a GHash-based check in libraries reading code to ensure we only load a same ID from a same lib once. --- source/blender/blenloader/intern/readfile.c | 31 ++++++++++++++++++++++------- 1 file changed, 24 insertions(+), 7 deletions(-) (limited to 'source/blender/blenloader/intern') diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index f45ff677ae3..d6868e67fc7 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -10472,6 +10472,7 @@ static void read_libraries(FileData *basefd, ListBase *mainlist) Main *mainl = mainlist->first; Main *mainptr; ListBase *lbarray[MAX_LIBARRAY]; + GHash *loaded_ids = BLI_ghash_str_new(__func__); int a; bool do_it = true; @@ -10485,7 +10486,7 @@ static void read_libraries(FileData *basefd, ListBase *mainlist) mainptr= mainl->next; while (mainptr) { if (mainvar_id_tag_any_check(mainptr, LIB_TAG_READ)) { - // printf("found LIB_TAG_READ %s\n", mainptr->curlib->name); + // printf("found LIB_TAG_READ %s (%s)\n", mainptr->curlib->id.name, mainptr->curlib->name); FileData *fd = mainptr->curlib->filedata; @@ -10583,25 +10584,38 @@ static void read_libraries(FileData *basefd, ListBase *mainlist) a = set_listbasepointers(mainptr, lbarray); while (a--) { ID *id = lbarray[a]->first; + ListBase pending_free_ids = {NULL}; while (id) { ID *idn = id->next; if (id->tag & LIB_TAG_READ) { - ID *realid = NULL; BLI_remlink(lbarray[a], id); - link_id_part(basefd->reports, fd, mainptr, id, &realid); + /* When playing with lib renaming and such, you may end with cases where you have + * more than one linked ID of the same data-block from same library. + * This is absolutely horrible, hence we use a ghash to ensure we go back to a single + * linked data when loading the file... */ + ID **realid = NULL; + if (!BLI_ghash_ensure_p(loaded_ids, id->name, (void ***)&realid)) { + link_id_part(basefd->reports, fd, mainptr, id, realid); + } /* realid shall never be NULL - unless some source file/lib is broken * (known case: some directly linked shapekey from a missing lib...). */ - /* BLI_assert(realid != NULL); */ + /* BLI_assert(*realid != NULL); */ - change_idid_adr(mainlist, basefd, id, realid); + change_idid_adr(mainlist, basefd, id, *realid); - MEM_freeN(id); + /* We cannot free old lib-ref placeholder ID here anymore, since we use its name + * as key in loaded_ids hass. */ + BLI_addtail(&pending_free_ids, id); } id = idn; } + + /* Clear GHash and free all lib-ref placeholders IDs of that type now. */ + BLI_ghash_clear(loaded_ids, NULL, NULL); + BLI_freelistN(&pending_free_ids); } BLO_expand_main(fd, mainptr); } @@ -10609,7 +10623,10 @@ static void read_libraries(FileData *basefd, ListBase *mainlist) mainptr = mainptr->next; } } - + + BLI_ghash_free(loaded_ids, NULL, NULL); + loaded_ids = NULL; + /* test if there are unread libblocks */ /* XXX This code block is kept for 2.77, until we are sure it never gets reached anymore. Can be removed later. */ for (mainptr = mainl->next; mainptr; mainptr = mainptr->next) { -- cgit v1.2.3