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/editors/interface | |
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/editors/interface')
-rw-r--r-- | source/blender/editors/interface/interface_templates.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c index 7a80baf1b80..1566c9c4e88 100644 --- a/source/blender/editors/interface/interface_templates.c +++ b/source/blender/editors/interface/interface_templates.c @@ -557,7 +557,7 @@ static void template_id_cb(bContext *C, void *arg_litem, void *arg_event) } } else { - if (BKE_lib_id_make_local(bmain, id, false, false)) { + if (BKE_lib_id_make_local(bmain, id, false, 0)) { BKE_main_id_clear_newpoins(bmain); /* reassign to get get proper updates/notifiers */ @@ -879,8 +879,7 @@ static void template_ID(bContext *C, UI_but_flag_enable(but, UI_BUT_DISABLED); } else { - const bool disabled = (!BKE_lib_id_make_local( - CTX_data_main(C), id, true /* test */, false) || + const bool disabled = (!BKE_lib_id_make_local(CTX_data_main(C), id, true /* test */, 0) || (idfrom && idfrom->lib)); but = uiDefIconBut(block, UI_BTYPE_BUT, |