diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2016-02-15 21:35:35 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2016-02-15 21:38:51 +0300 |
| commit | 9a0fb589f70ce20618291b30ec45b230f8ff234d (patch) | |
| tree | ee6f5c246ac7c911aedb072eaa1a5546d81e2994 /source/blender/editors/object | |
| parent | a1495366af1d53382e6f01e4c75c39dcd137217e (diff) | |
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.
Diffstat (limited to 'source/blender/editors/object')
| -rw-r--r-- | source/blender/editors/object/object_add.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/object/object_bake_api.c | 4 | ||||
| -rw-r--r-- | source/blender/editors/object/object_relations.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c index 1cab8918abc..57d16d3104b 100644 --- a/source/blender/editors/object/object_add.c +++ b/source/blender/editors/object/object_add.c @@ -1159,7 +1159,7 @@ static int object_delete_exec(bContext *C, wmOperator *op) return OPERATOR_CANCELLED; /* delete has to handle all open scenes */ - BKE_main_id_flag_listbase(&bmain->scene, LIB_TAG_DOIT, 1); + BKE_main_id_tag_listbase(&bmain->scene, LIB_TAG_DOIT, 1); for (win = wm->windows.first; win; win = win->next) { scene = win->screen->scene; diff --git a/source/blender/editors/object/object_bake_api.c b/source/blender/editors/object/object_bake_api.c index f9ab0f45996..fd95d6129ad 100644 --- a/source/blender/editors/object/object_bake_api.c +++ b/source/blender/editors/object/object_bake_api.c @@ -497,7 +497,7 @@ static bool bake_objects_check(Main *bmain, Object *ob, ListBase *selected_objec CollectionPointerLink *link; /* error handling and tag (in case multiple materials share the same image) */ - BKE_main_id_tag_idcode(bmain, ID_IM, false); + BKE_main_id_tag_idcode(bmain, ID_IM, LIB_TAG_DOIT, false); if (is_selected_to_active) { int tot_objects = 0; @@ -555,7 +555,7 @@ static void build_image_lookup(Main *bmain, Object *ob, BakeImages *bake_images) int tot_images = 0; /* error handling and tag (in case multiple materials share the same image) */ - BKE_main_id_tag_idcode(bmain, ID_IM, false); + BKE_main_id_tag_idcode(bmain, ID_IM, LIB_TAG_DOIT, false); for (i = 0; i < tot_mat; i++) { Image *image; diff --git a/source/blender/editors/object/object_relations.c b/source/blender/editors/object/object_relations.c index b390fc1bfea..41b9c95bc77 100644 --- a/source/blender/editors/object/object_relations.c +++ b/source/blender/editors/object/object_relations.c @@ -2135,7 +2135,7 @@ static void tag_localizable_objects(bContext *C, const int mode) { Main *bmain = CTX_data_main(C); - BKE_main_id_tag_all(bmain, false); + BKE_main_id_tag_all(bmain, LIB_TAG_DOIT, false); /* Set LIB_TAG_DOIT flag for all selected objects, so next we can check whether * object is gonna to become local or not. |