[Bf-blender-cvs] [8323e9f] master: Cleanup: make readfile.c also use ID_FAKE_USERS.
Bastien Montagne
noreply at git.blender.org
Tue Nov 10 17:29:37 CET 2015
Commit: 8323e9f790548a175e7e0c7d15da94b608ef0ddf
Author: Bastien Montagne
Date: Tue Nov 10 17:29:12 2015 +0100
Branches: master
https://developer.blender.org/rB8323e9f790548a175e7e0c7d15da94b608ef0ddf
Cleanup: make readfile.c also use ID_FAKE_USERS.
===================================================================
M source/blender/blenloader/intern/readfile.c
===================================================================
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 73e13a7..1108a75 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -7928,7 +7928,7 @@ static BHead *read_libblock(FileData *fd, Main *main, BHead *bhead, int flag, ID
/* clear first 8 bits */
id->flag = (id->flag & 0xFF00) | flag | LIB_NEED_LINK;
id->lib = main->curlib;
- id->us = (id->flag & LIB_FAKEUSER) ? 1 : 0;
+ id->us = ID_FAKE_USERS(id);
id->icon_id = 0;
id->flag &= ~(LIB_ID_RECALC | LIB_ID_RECALC_DATA | LIB_DOIT | LIB_MISSING);
@@ -9615,7 +9615,7 @@ static ID *create_placeholder(Main *mainvar, const char *idname, const short fla
BKE_libblock_init_empty(ph_id);
ph_id->lib = mainvar->curlib;
ph_id->flag = flag | LIB_MISSING;
- ph_id->us = (flag & LIB_FAKEUSER) ? 1 : 0;
+ ph_id->us = ID_FAKE_USERS(ph_id);
ph_id->icon_id = 0;
BLI_addtail(lb, ph_id);
More information about the Bf-blender-cvs
mailing list