blender
/
blender
131
398
Fork 577
Code Issues 6.3k Pull Requests 744 Projects 19 Wiki Activity

Cleanup: hide debug print behind proper debug defines instead of using comments...

This commit is contained in:
Bastien Montagne 2016-06-21 16:19:08 +02:00
parent e34ade4eb3
commit db4a46bc3c
2 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/blenloader/intern/readblenentry.c
View File

@ -423,11 +423,11 @@ BlendFileData *BLO_read_from_memfile(Main *oldmain, const char *filename, MemFil
BLI_remlink(&old_mainlist, libmain);
BLI_addtail(&new_mainlist, libmain);
}
#if 0
else {
#ifdef PRINT_DEBUG
printf("Dropped Main for lib: %s\n", libmain->curlib->id.name);
}
#endif
}
}
/* In any case, we need to move all lib datablocks themselves - those are 'first level data',
* getting rid of them would imply updating spaces & co to prevent invalid pointers access. */

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

@ -7949,16 +7949,22 @@ static BHead *read_libblock(FileData *fd, Main *main, BHead *bhead, const short
if (fd->memfile && ELEM(bhead->code, ID_LI, ID_ID)) {
const char *idname = bhead_id_name(fd, bhead);
/* printf("Checking %s...\n", idname); */
#ifdef PRINT_DEBUG
printf("Checking %s...\n", idname);
#endif
if (bhead->code == ID_LI) {
Main *libmain = fd->old_mainlist->first;
/* Skip oldmain itself... */
for (libmain = libmain->next; libmain; libmain = libmain->next) {
/* printf("... against %s: ", libmain->curlib ? libmain->curlib->id.name : "<NULL>"); */
#ifdef PRINT_DEBUG
printf("... against %s: ", libmain->curlib ? libmain->curlib->id.name : "<NULL>");
#endif
if (libmain->curlib && STREQ(idname, libmain->curlib->id.name)) {
Main *oldmain = fd->old_mainlist->first;
/* printf("FOUND!\n"); */
#ifdef PRINT_DEBUG
printf("FOUND!\n");
#endif
/* In case of a library, we need to re-add its main to fd->mainlist, because if we have later
* a missing ID_ID, we need to get the correct lib it is linked to!
* Order is crucial, we cannot bulk-add it in BLO_read_from_memfile() like it used to be... */
@ -7972,13 +7978,19 @@ static BHead *read_libblock(FileData *fd, Main *main, BHead *bhead, const short
}
return blo_nextbhead(fd, bhead);
}
/* printf("nothing...\n"); */
#ifdef PRINT_DEBUG
printf("nothing...\n");
#endif
}
}
else {
/* printf("... in %s (%s): ", main->curlib ? main->curlib->id.name : "<NULL>", main->curlib ? main->curlib->name : "<NULL>"); */
#ifdef PRINT_DEBUG
printf("... in %s (%s): ", main->curlib ? main->curlib->id.name : "<NULL>", main->curlib ? main->curlib->name : "<NULL>");
#endif
if ((id = BKE_libblock_find_name_ex(main, GS(idname), idname + 2))) {
/* printf("FOUND!\n"); */
#ifdef PRINT_DEBUG
printf("FOUND!\n");
#endif
/* Even though we found our linked ID, there is no guarantee its address is still the same... */
if (id != bhead->old) {
oldnewmap_insert(fd->libmap, bhead->old, id, GS(id->name));
@ -7990,7 +8002,9 @@ static BHead *read_libblock(FileData *fd, Main *main, BHead *bhead, const short
}
return blo_nextbhead(fd, bhead);
}
/* printf("nothing...\n"); */
#ifdef PRINT_DEBUG
printf("nothing...\n");
#endif
}
}