blender
/
blender
131
398
Fork 577
Code Issues 6.2k Pull Requests 742 Projects 19 Wiki Activity

readfile: minor optimization, no need to count flags 

in this case we only need to check if any id's need to be read.
This commit is contained in:
Campbell Barton 2016-06-06 19:03:09 +10:00
parent 894d24fb16
commit 5d45ffc755
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9990,21 +9990,22 @@ void *BLO_library_read_struct(FileData *fd, BHead *bh, const char *blockname)
/* ************* READ LIBRARY ************** */
static int mainvar_count_libread_blocks(Main *mainvar)
static int mainvar_id_tag_any_check(Main *mainvar, const short tag)
{
ListBase *lbarray[MAX_LIBARRAY];
int a, tot = 0;
int a;
a = set_listbasepointers(mainvar, lbarray);
while (a--) {
ID *id;
for (id = lbarray[a]->first; id; id = id->next) {
if (id->tag & LIB_TAG_READ)
tot++;
if (id->tag & tag) {
return true;
}
}
}
return tot;
return false;
}
static void read_libraries(FileData *basefd, ListBase *mainlist)
@ -10024,10 +10025,9 @@ static void read_libraries(FileData *basefd, ListBase *mainlist)
/* test 1: read libdata */
mainptr= mainl->next;
while (mainptr) {
int tot = mainvar_count_libread_blocks(mainptr);
// printf("found LIB_TAG_READ %s\n", mainptr->curlib->name);
if (tot) {
if (mainvar_id_tag_any_check(mainptr, LIB_TAG_READ)) {
// printf("found LIB_TAG_READ %s\n", mainptr->curlib->name);
FileData *fd = mainptr->curlib->filedata;
if (fd == NULL) {