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/action.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/action.c')
-rw-r--r-- | source/blender/blenkernel/intern/action.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/blenkernel/intern/action.c b/source/blender/blenkernel/intern/action.c index 46ee8a4d888..9d6b2a05681 100644 --- a/source/blender/blenkernel/intern/action.c +++ b/source/blender/blenkernel/intern/action.c @@ -107,7 +107,7 @@ static void make_localact_init_cb(ID *id, AnimData *adt, void *mlac_ptr) tMakeLocalActionContext *mlac = (tMakeLocalActionContext *)mlac_ptr; if (adt->action == mlac->act) { - if (id->lib) mlac->is_lib = true; + if (ID_IS_LINKED_DATABLOCK(id)) mlac->is_lib = true; else mlac->is_local = true; } } @@ -118,7 +118,7 @@ static void make_localact_apply_cb(ID *id, AnimData *adt, void *mlac_ptr) tMakeLocalActionContext *mlac = (tMakeLocalActionContext *)mlac_ptr; if (adt->action == mlac->act) { - if (id->lib == NULL) { + if (!ID_IS_LINKED_DATABLOCK(id)) { adt->action = mlac->act_new; id_us_plus(&mlac->act_new->id); @@ -133,7 +133,7 @@ void BKE_action_make_local(bAction *act) tMakeLocalActionContext mlac = {act, NULL, false, false}; Main *bmain = G.main; - if (act->id.lib == NULL) + if (!ID_IS_LINKED_DATABLOCK(act)) return; /* XXX: double-check this; it used to be just single-user check, but that was when fake-users were still default */ @@ -213,7 +213,7 @@ bAction *BKE_action_copy(bAction *src) } } - if (src->id.lib) { + if (ID_IS_LINKED_DATABLOCK(src)) { BKE_id_lib_local_paths(G.main, src->id.lib, &dst->id); } |