diff options
| author | Bastien Montagne <b.mont29@gmail.com> | 2020-03-04 13:42:15 +0300 |
|---|---|---|
| committer | Bastien Montagne <b.mont29@gmail.com> | 2020-03-04 13:43:31 +0300 |
| commit | 4bfa256ea48e51643f848e8dfdaeab615f7b1a88 (patch) | |
| tree | 996d59300eeff16f1063a6be8887aaa3cfcb4299 /source/blender/blenkernel/intern/brush.c | |
| parent | 4e597a5cff6bb4195b8fc9c8102bfbdc4958b31f (diff) | |
Refactor ID make local to use a single flag parameter.
Instead of using anonymous booleans flags, also allows to keep the same
behavior in all cases, without needing special handling from calling
code for our beloved oddballs object proxies...
Diffstat (limited to 'source/blender/blenkernel/intern/brush.c')
| -rw-r--r-- | source/blender/blenkernel/intern/brush.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/brush.c b/source/blender/blenkernel/intern/brush.c index aba7df0a936..8abad2d541d 100644 --- a/source/blender/blenkernel/intern/brush.c +++ b/source/blender/blenkernel/intern/brush.c @@ -766,8 +766,9 @@ void BKE_brush_free(Brush *brush) BKE_previewimg_free(&(brush->preview)); } -void BKE_brush_make_local(Main *bmain, Brush *brush, const bool lib_local) +void BKE_brush_make_local(Main *bmain, Brush *brush, const int flags) { + const bool lib_local = (flags & LIB_ID_MAKELOCAL_FULL_LIBRARY) != 0; bool is_local = false, is_lib = false; /* - only lib users: do nothing (unless force_local is set) @@ -781,7 +782,7 @@ void BKE_brush_make_local(Main *bmain, Brush *brush, const bool lib_local) if (brush->clone.image) { /* Special case: ima always local immediately. Clone image should only have one user anyway. */ - BKE_lib_id_make_local(bmain, &brush->clone.image->id, false, false); + BKE_lib_id_make_local(bmain, &brush->clone.image->id, false, 0); } BKE_library_ID_test_usages(bmain, brush, &is_local, &is_lib); |