diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2015-10-20 15:24:30 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2015-10-20 15:24:30 +0300 |
| commit | f609e01fb55a09e56fb6f8efbd1ec89cb1c8902c (patch) | |
| tree | d2424f858d51a976d21d2e9339f7d53aa9ddeee4 | |
| parent | a7869babcd4de7c82bfe5ceebbdd30afcc3a999d (diff) | |
Cleanup & comments from review.missing-libs
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 6 | ||||
| -rw-r--r-- | source/blender/makesdna/DNA_ID.h | 1 |
2 files changed, 5 insertions, 2 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index dda5c111756..6545a3b0e67 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -10090,6 +10090,7 @@ static void read_libraries(FileData *basefd, ListBase *mainlist) } /* 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--) { @@ -10098,11 +10099,12 @@ static void read_libraries(FileData *basefd, ListBase *mainlist) for (id = lbarray[a]->first; id; id = idn) { idn = id->next; if (id->flag & LIB_READ) { - printf("SHALL NOT HAPPEN ANYMORE!!!!!!!\n"); + BLI_assert(0); BLI_remlink(lbarray[a], id); blo_reportf_wrap( basefd->reports, RPT_WARNING, - TIP_("LIB ERROR: %s: '%s' unread lib block missing from '%s', parent '%s'"), + TIP_("LIB ERROR: %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, diff --git a/source/blender/makesdna/DNA_ID.h b/source/blender/makesdna/DNA_ID.h index 7f66a40e46e..c2901b8b9a5 100644 --- a/source/blender/makesdna/DNA_ID.h +++ b/source/blender/makesdna/DNA_ID.h @@ -282,6 +282,7 @@ enum { LIB_TESTIND = (LIB_NEED_EXPAND | LIB_INDIRECT), LIB_READ = 1 << 4, LIB_NEED_LINK = 1 << 5, + /* tag datablock as a place-holder (because the real one could not be linked from its library e.g.). */ LIB_MISSING = 1 << 6, LIB_NEW = 1 << 8, |