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/brush.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/brush.c')
-rw-r--r-- | source/blender/blenkernel/intern/brush.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/blenkernel/intern/brush.c b/source/blender/blenkernel/intern/brush.c index 44cacffb71f..4a5be1d3d92 100644 --- a/source/blender/blenkernel/intern/brush.c +++ b/source/blender/blenkernel/intern/brush.c @@ -195,7 +195,7 @@ Brush *BKE_brush_copy(Brush *brush) /* enable fake user by default */ id_fake_user_set(&brush->id); - if (brush->id.lib) { + if (ID_IS_LINKED_DATABLOCK(brush)) { BKE_id_lib_local_paths(G.main, brush->id.lib, &brushn->id); } @@ -237,7 +237,7 @@ void BKE_brush_make_local(Brush *brush) Scene *scene; bool is_local = false, is_lib = false; - if (brush->id.lib == NULL) return; + if (!ID_IS_LINKED_DATABLOCK(brush)) return; if (brush->clone.image) { /* special case: ima always local immediately. Clone image should only @@ -248,7 +248,7 @@ void BKE_brush_make_local(Brush *brush) for (scene = bmain->scene.first; scene && ELEM(0, is_lib, is_local); scene = scene->id.next) { if (BKE_paint_brush(&scene->toolsettings->imapaint.paint) == brush) { - if (scene->id.lib) is_lib = true; + if (ID_IS_LINKED_DATABLOCK(scene)) is_lib = true; else is_local = true; } } @@ -269,7 +269,7 @@ void BKE_brush_make_local(Brush *brush) for (scene = bmain->scene.first; scene; scene = scene->id.next) { if (BKE_paint_brush(&scene->toolsettings->imapaint.paint) == brush) { - if (scene->id.lib == NULL) { + if (!ID_IS_LINKED_DATABLOCK(scene)) { BKE_paint_brush_set(&scene->toolsettings->imapaint.paint, brush_new); } } |