archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Activity

Cleanup & comments from review.

Browse Source
This commit is contained in:
Bastien Montagne
2015-10-20 14:24:30 +02:00
parent a7869babcd
commit f609e01fb5
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/blenloader/intern/readfile.c
View File

@@ -10090,6 +10090,7 @@ static void read_libraries(FileData *basefd, ListBase *mainlist)
} }
/* test if there are unread libblocks */ /* 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) { for (mainptr = mainl->next; mainptr; mainptr = mainptr->next) {
a = set_listbasepointers(mainptr, lbarray); a = set_listbasepointers(mainptr, lbarray);
while (a--) { while (a--) {
@@ -10098,11 +10099,12 @@ static void read_libraries(FileData *basefd, ListBase *mainlist)
for (id = lbarray[a]->first; id; id = idn) { for (id = lbarray[a]->first; id; id = idn) {
idn = id->next; idn = id->next;
if (id->flag & LIB_READ) { if (id->flag & LIB_READ) {
printf("SHALL NOT HAPPEN ANYMORE!!!!!!!\n"); BLI_assert(0);
BLI_remlink(lbarray[a], id); BLI_remlink(lbarray[a], id);
blo_reportf_wrap( blo_reportf_wrap(
basefd->reports, RPT_WARNING, 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)), BKE_idcode_to_name(GS(id->name)),
id->name + 2, id->name + 2,
mainptr->curlib->filepath, mainptr->curlib->filepath,

1
source/blender/makesdna/DNA_ID.h
View File

@@ -282,6 +282,7 @@ enum {
LIB_TESTIND = (LIB_NEED_EXPAND | LIB_INDIRECT), LIB_TESTIND = (LIB_NEED_EXPAND | LIB_INDIRECT),
LIB_READ = 1 << 4, LIB_READ = 1 << 4,
LIB_NEED_LINK = 1 << 5, 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_MISSING = 1 << 6,
LIB_NEW = 1 << 8, LIB_NEW = 1 << 8,