diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2016-03-14 17:05:52 +0300 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2016-03-14 17:05:52 +0300 |
commit | 00166ff62e689b7caebdd3a0c4f9051b2739826a (patch) | |
tree | 7daed8f9b67b1d4b5c3597997b335b9ad6ef484f /source/blender/blenloader/intern | |
parent | 6b1d77a8052b0706ef2277cb1a5e4f3c67310806 (diff) |
Better fix for T47787 - remove extra user due to 'user_one' as soon as we increase 'real' user count.
This has several benefits:
* User count remains coherent, regardless of the order in which you use 'user_one' & real refcounting users
(i.e. if you add to group, and then link in scene, or the reverse, you now always get same final user count).
* Avoids the need to check for potential 'user_one' extra user in count in several places in code (e.g. when
making IDs single users...).
* Users won't wonder why they cannot make 'single user' and ID even though its user count shows '2'!
* readfile.c now always uses code from BKE's library.c when modifying id->us. Which means we can consider
(asside from assignment during initialization) that id->us is read-only outside of library.c context.
Note that this commit reverts previous one (rB6b1d77a8052b) - please **do not** backport this one in 2.77.
Diffstat (limited to 'source/blender/blenloader/intern')
-rw-r--r-- | source/blender/blenloader/intern/readfile.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 375837437d8..8b41c618c99 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -1497,8 +1497,7 @@ static void *newlibadr_us(FileData *fd, void *lib, void *adr) /* increases user { ID *id = newlibadr(fd, lib, adr); - if (id) - id->us++; + id_us_plus_no_lib(id); return id; } @@ -4640,7 +4639,7 @@ static void lib_link_modifiers__linkModifiers( *idpoin = newlibadr(fd, ob->id.lib, *idpoin); if (*idpoin != NULL && (cd_flag & IDWALK_USER) != 0) { - (*idpoin)->us++; + id_us_plus_no_lib(*idpoin); } } static void lib_link_modifiers(FileData *fd, Object *ob) @@ -5638,7 +5637,7 @@ static void lib_link_scene(FileData *fd, Main *main) seq->sound = newlibadr(fd, sce->id.lib, seq->sound); } if (seq->sound) { - seq->sound->id.us++; + id_us_plus_no_lib((ID *)seq->sound); seq->scene_sound = BKE_sound_add_scene_sound_defaults(sce, seq); } } @@ -9580,7 +9579,7 @@ static void give_base_to_objects(Main *mainvar, Scene *scene, View3D *v3d, Libra base->flag = ob->flag; CLAMP_MIN(ob->id.us, 0); - ob->id.us += 1; + id_us_plus_no_lib((ID *)ob); ob->id.tag &= ~LIB_TAG_INDIRECT; ob->id.tag |= LIB_TAG_EXTERN; @@ -9704,7 +9703,7 @@ static void link_object_postprocess(ID *id, Scene *scene, View3D *v3d, const sho base->lay = ob->lay; base->object = ob; base->flag = ob->flag; - ob->id.us++; + id_us_plus_no_lib((ID *)ob); if (flag & FILE_AUTOSELECT) { base->flag |= SELECT; |