diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2016-07-06 15:11:01 +0300 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2016-07-06 15:11:01 +0300 |
commit | d2312602125a452e6562a76ab91779943c67396d (patch) | |
tree | da74fa2bce05d94d6bc800021d837b494e6936d7 /source/blender/blenkernel/intern/lamp.c | |
parent | b98b331d04fe3a335cc0656809b4b09196507500 (diff) |
Replace of (id->lib != NULL) check by meaningful macro.
Idea is to replace hard-to-track (id->lib != NULL) 'is linked datablock' check everywhere in Blender
by a macro doing the same thing. This will allow to easily spot those checks in future, and more importantly,
to easily change it (see work done in asset-engine branch).
Note: did not touch to readfile.c, since there most of the time 'id->lib' check actually concerns the pointer,
and not a check whether ID is linked or not. Will have a closer look at it later.
Reviewers: campbellbarton, brecht, sergey
Differential Revision: https://developer.blender.org/D2082
Diffstat (limited to 'source/blender/blenkernel/intern/lamp.c')
-rw-r--r-- | source/blender/blenkernel/intern/lamp.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/blenkernel/intern/lamp.c b/source/blender/blenkernel/intern/lamp.c index 692b703f721..43396834650 100644 --- a/source/blender/blenkernel/intern/lamp.c +++ b/source/blender/blenkernel/intern/lamp.c @@ -137,7 +137,7 @@ Lamp *BKE_lamp_copy(Lamp *la) if (la->preview) lan->preview = BKE_previewimg_copy(la->preview); - if (la->id.lib) { + if (ID_IS_LINKED_DATABLOCK(la)) { BKE_id_lib_local_paths(G.main, la->id.lib, &lan->id); } @@ -181,7 +181,7 @@ void BKE_lamp_make_local(Lamp *la) * - mixed: make copy */ - if (la->id.lib == NULL) return; + if (!ID_IS_LINKED_DATABLOCK(la)) return; if (la->id.us == 1) { id_clear_lib_data(bmain, &la->id); return; @@ -190,7 +190,7 @@ void BKE_lamp_make_local(Lamp *la) ob = bmain->object.first; while (ob) { if (ob->data == la) { - if (ob->id.lib) is_lib = true; + if (ID_IS_LINKED_DATABLOCK(ob)) is_lib = true; else is_local = true; } ob = ob->id.next; @@ -210,7 +210,7 @@ void BKE_lamp_make_local(Lamp *la) while (ob) { if (ob->data == la) { - if (ob->id.lib == NULL) { + if (!ID_IS_LINKED_DATABLOCK(ob)) { ob->data = la_new; id_us_plus(&la_new->id); id_us_min(&la->id); |