From 76d8e8693fab13d300130dc3a9bd75f6f637991d Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Wed, 4 Mar 2020 10:38:30 +0100 Subject: Cleanup: Rename 'make local' functions to new scheme. Also removed some only used locally from the header, `BKE_lib_id.h` is already way too big, no need to overload it with unused things. --- source/blender/editors/interface/interface_templates.c | 5 +++-- source/blender/editors/space_outliner/outliner_tools.c | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'source/blender/editors') diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c index 9294f614e18..7a80baf1b80 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 (id_make_local(bmain, id, false, false)) { + if (BKE_lib_id_make_local(bmain, id, false, false)) { BKE_main_id_clear_newpoins(bmain); /* reassign to get get proper updates/notifiers */ @@ -879,7 +879,8 @@ static void template_ID(bContext *C, UI_but_flag_enable(but, UI_BUT_DISABLED); } else { - const bool disabled = (!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 */, false) || (idfrom && idfrom->lib)); but = uiDefIconBut(block, UI_BTYPE_BUT, diff --git a/source/blender/editors/space_outliner/outliner_tools.c b/source/blender/editors/space_outliner/outliner_tools.c index 503a4570352..5a3663a12b9 100644 --- a/source/blender/editors/space_outliner/outliner_tools.c +++ b/source/blender/editors/space_outliner/outliner_tools.c @@ -698,8 +698,8 @@ static void id_local_cb(bContext *C, Main *bmain = CTX_data_main(C); /* if the ID type has no special local function, * just clear the lib */ - if (id_make_local(bmain, tselem->id, false, false) == false) { - id_clear_lib_data(bmain, tselem->id); + if (BKE_lib_id_make_local(bmain, tselem->id, false, false) == false) { + BKE_lib_id_clear_library_data(bmain, tselem->id); } else { BKE_main_id_clear_newpoins(bmain); -- cgit v1.2.3