[Bf-blender-cvs] [11ff2022d5c] blender2.8: Cleanup: remove deprecated piece of code in library reading code.

Bastien Montagne noreply at git.blender.org
Wed Dec 5 11:46:58 CET 2018


Commit: 11ff2022d5c023c25ce015c33a5671728d181846
Author: Bastien Montagne
Date:   Wed Dec 5 11:45:01 2018 +0100
Branches: blender2.8
https://developer.blender.org/rB11ff2022d5c023c25ce015c33a5671728d181846

Cleanup: remove deprecated piece of code in library reading code.

That one was flagged as useless since 2.77, and only kept 'to be sure'
everything was OK. This was years ago now, and never got any report on
this, so 2.8 sounds like a good time to nuke it.

===================================================================

M	source/blender/blenloader/intern/readfile.c

===================================================================

diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 75abdf15bc0..10da6064f0b 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -10977,34 +10977,6 @@ static void read_libraries(FileData *basefd, ListBase *mainlist)
 	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) {
-		a = set_listbasepointers(mainptr, lbarray);
-		while (a--) {
-			ID *id, *idn = NULL;
-
-			for (id = lbarray[a]->first; id; id = idn) {
-				idn = id->next;
-				if (id->tag & LIB_TAG_READ) {
-					BLI_assert(0);
-					BLI_remlink(lbarray[a], id);
-					blo_reportf_wrap(
-					        basefd->reports, RPT_ERROR,
-					        TIP_("LIB: %s: '%s' unread lib block missing from '%s', parent '%s' - "
-					             "Please file a bug report if you see this message"),
-					        BKE_idcode_to_name(GS(id->name)),
-					        id->name + 2,
-					        mainptr->curlib->filepath,
-					        library_parent_filepath(mainptr->curlib));
-					change_idid_adr(mainlist, basefd, id, NULL);
-
-					MEM_freeN(id);
-				}
-			}
-		}
-	}
-
 	/* do versions, link, and free */
 	Main *main_newid = BKE_main_new();
 	for (mainptr = mainl->next; mainptr; mainptr = mainptr->next) {



More information about the Bf-blender-cvs mailing list