From 9a0fb589f70ce20618291b30ec45b230f8ff234d Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Mon, 15 Feb 2016 19:35:35 +0100 Subject: Cleanup: reorganize BKE ID tagging functions. BKE_main_id_tag_/BKE_main_id_flag_ were horrible naming now that we split those into flags (for presistent one) and tags (for runtime ones). Got rid of previous 'tag_' functions behavior (those who were dedicated shortcuts to set/clear LIB_TAG_DOIT), so now '_tag_' functions affect tags, and '_flag_' functions affect flags. --- source/blender/windowmanager/intern/wm_operators.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'source/blender/windowmanager/intern') diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c index 70557a0f2b1..8a9b069bdc3 100644 --- a/source/blender/windowmanager/intern/wm_operators.c +++ b/source/blender/windowmanager/intern/wm_operators.c @@ -2626,7 +2626,7 @@ static int wm_link_append_exec(bContext *C, wmOperator *op) * its also generally useful to know what is new * * take extra care BKE_main_id_flag_all(bmain, LIB_TAG_PRE_EXISTING, false) is called after! */ - BKE_main_id_flag_all(bmain, LIB_TAG_PRE_EXISTING, true); + BKE_main_id_tag_all(bmain, LIB_TAG_PRE_EXISTING, true); /* We define our working data... * Note that here, each item 'uses' one library, and only one. */ @@ -2707,7 +2707,7 @@ static int wm_link_append_exec(bContext *C, wmOperator *op) /* important we unset, otherwise these object wont * link into other scenes from this blend file */ - BKE_main_id_flag_all(bmain, LIB_TAG_PRE_EXISTING, false); + BKE_main_id_tag_all(bmain, LIB_TAG_PRE_EXISTING, false); /* recreate dependency graph to include new objects */ DAG_scene_relations_rebuild(bmain, scene); @@ -4897,7 +4897,7 @@ static int previews_ensure_exec(bContext *C, wmOperator *UNUSED(op)) int i; /* We use LIB_TAG_DOIT to check whether we have already handled a given ID or not. */ - BKE_main_id_flag_all(bmain, LIB_TAG_DOIT, true); + BKE_main_id_tag_all(bmain, LIB_TAG_DOIT, true); BLI_LINKSTACK_INIT(preview_id_stack.id_stack); -- cgit v1.2.3