diff options
Diffstat (limited to 'source/blender/editors')
12 files changed, 28 insertions, 24 deletions
diff --git a/source/blender/editors/armature/editarmature_sketch.c b/source/blender/editors/armature/editarmature_sketch.c index f01eed21996..dcf4c9a0e9c 100644 --- a/source/blender/editors/armature/editarmature_sketch.c +++ b/source/blender/editors/armature/editarmature_sketch.c @@ -169,7 +169,7 @@ void BIF_makeListTemplates(const bContext *C) } } } - FOREACH_OBJECT_END + FOREACH_OBJECT_END; } #if 0 /* UNUSED */ diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c index 0b32ae5a0e4..75b657e1e29 100644 --- a/source/blender/editors/interface/interface_templates.c +++ b/source/blender/editors/interface/interface_templates.c @@ -355,7 +355,7 @@ static void id_search_cb_objects_from_scene(const bContext *C, void *arg_templat { ob_iter->id.tag |= LIB_TAG_DOIT; } - FOREACH_SCENE_OBJECT_END + FOREACH_SCENE_OBJECT_END; id_search_cb_tagged(C, arg_template, str, items); } diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c index eba1b2e4fde..3590b38310f 100644 --- a/source/blender/editors/object/object_add.c +++ b/source/blender/editors/object/object_add.c @@ -1739,7 +1739,7 @@ static int convert_exec(bContext *C, wmOperator *op) } } } - FOREACH_SCENE_OBJECT_END + FOREACH_SCENE_OBJECT_END; } ListBase selected_editable_bases = CTX_data_collection_get(C, "selected_editable_bases"); @@ -2022,7 +2022,7 @@ static int convert_exec(bContext *C, wmOperator *op) } } } - FOREACH_SCENE_OBJECT_END + FOREACH_SCENE_OBJECT_END; } /* delete object should renew depsgraph */ diff --git a/source/blender/editors/object/object_relations.c b/source/blender/editors/object/object_relations.c index 3575601973d..3c54c6d0d5a 100644 --- a/source/blender/editors/object/object_relations.c +++ b/source/blender/editors/object/object_relations.c @@ -406,7 +406,7 @@ static const EnumPropertyItem *proxy_group_object_itemf(bContext *C, PointerRNA item_tmp.value = i++; RNA_enum_item_add(&item, &totitem, &item_tmp); } - FOREACH_GROUP_OBJECT_END + FOREACH_GROUP_OBJECT_END; RNA_enum_item_end(&item, &totitem); *r_free = true; @@ -1717,7 +1717,7 @@ static void single_object_users(Main *bmain, Scene *scene, View3D *v3d, const in break; } } - FOREACH_GROUP_OBJECT_END + FOREACH_GROUP_OBJECT_END; if (all_duplicated) { groupn = ID_NEW_SET(group, BKE_group_copy(bmain, group)); @@ -1751,7 +1751,7 @@ void ED_object_single_user(Main *bmain, Scene *scene, Object *ob) { ob_iter->flag &= ~OB_DONE; } - FOREACH_SCENE_OBJECT_END + FOREACH_SCENE_OBJECT_END; /* tag only the one object */ ob->flag |= OB_DONE; @@ -1865,7 +1865,7 @@ static void single_obdata_users(Main *bmain, Scene *scene, ViewLayer *view_layer } } } - FOREACH_OBJECT_FLAG_END + FOREACH_OBJECT_FLAG_END; me = bmain->mesh.first; while (me) { @@ -1877,11 +1877,13 @@ static void single_obdata_users(Main *bmain, Scene *scene, ViewLayer *view_layer static void single_object_action_users(Scene *scene, ViewLayer *view_layer, const int flag) { FOREACH_OBJECT_FLAG_BEGIN(scene, view_layer, flag, ob) + { if (!ID_IS_LINKED(ob)) { DEG_id_tag_update(&ob->id, OB_RECALC_DATA); BKE_animdata_copy_id_action(&ob->id, false); } - FOREACH_OBJECT_FLAG_END + } + FOREACH_OBJECT_FLAG_END; } static void single_mat_users(Main *bmain, Scene *scene, ViewLayer *view_layer, const int flag, const bool do_textures) @@ -1891,6 +1893,7 @@ static void single_mat_users(Main *bmain, Scene *scene, ViewLayer *view_layer, c int a, b; FOREACH_OBJECT_FLAG_BEGIN(scene, view_layer, flag, ob) + { if (!ID_IS_LINKED(ob)) { for (a = 1; a <= ob->totcol; a++) { ma = give_current_material(ob, a); @@ -1920,7 +1923,8 @@ static void single_mat_users(Main *bmain, Scene *scene, ViewLayer *view_layer, c } } } - FOREACH_OBJECT_FLAG_END + } + FOREACH_OBJECT_FLAG_END; } static void do_single_tex_user(Main *bmain, Tex **from) @@ -2051,7 +2055,7 @@ void ED_object_single_users(Main *bmain, Scene *scene, const bool full, const bo IDP_RelinkProperty(ob->id.properties); } } - FOREACH_SCENE_OBJECT_END + FOREACH_SCENE_OBJECT_END; if (scene->nodetree) { IDP_RelinkProperty(scene->nodetree->id.properties); diff --git a/source/blender/editors/object/object_vgroup.c b/source/blender/editors/object/object_vgroup.c index 613af8e5259..00a24e7fe72 100644 --- a/source/blender/editors/object/object_vgroup.c +++ b/source/blender/editors/object/object_vgroup.c @@ -3376,7 +3376,7 @@ static int vertex_group_copy_to_linked_exec(bContext *C, wmOperator *UNUSED(op)) } } } - FOREACH_SCENE_OBJECT_END + FOREACH_SCENE_OBJECT_END; return retval; } diff --git a/source/blender/editors/physics/physics_pointcache.c b/source/blender/editors/physics/physics_pointcache.c index 3062ccb83bf..b1d870a43ae 100644 --- a/source/blender/editors/physics/physics_pointcache.c +++ b/source/blender/editors/physics/physics_pointcache.c @@ -272,7 +272,7 @@ static int ptcache_free_bake_all_exec(bContext *C, wmOperator *UNUSED(op)) WM_event_add_notifier(C, NC_OBJECT|ND_POINTCACHE, ob); } - FOREACH_SCENE_OBJECT_END + FOREACH_SCENE_OBJECT_END; WM_event_add_notifier(C, NC_SCENE|ND_FRAME, scene); diff --git a/source/blender/editors/screen/screen_context.c b/source/blender/editors/screen/screen_context.c index 5f8520a92f8..4c217a5e829 100644 --- a/source/blender/editors/screen/screen_context.c +++ b/source/blender/editors/screen/screen_context.c @@ -107,7 +107,7 @@ int ed_screen_context(const bContext *C, const char *member, bContextDataResult { CTX_data_id_list_add(result, &ob->id); } - FOREACH_VISIBLE_BASE_END + FOREACH_VISIBLE_BASE_END; CTX_data_type_set(result, CTX_DATA_TYPE_COLLECTION); return 1; } @@ -125,7 +125,7 @@ int ed_screen_context(const bContext *C, const char *member, bContextDataResult { CTX_data_id_list_add(result, &ob->id); } - FOREACH_SELECTED_OBJECT_END + FOREACH_SELECTED_OBJECT_END; CTX_data_type_set(result, CTX_DATA_TYPE_COLLECTION); return 1; } @@ -136,7 +136,7 @@ int ed_screen_context(const bContext *C, const char *member, bContextDataResult CTX_data_id_list_add(result, &ob->id); } } - FOREACH_SELECTED_OBJECT_END + FOREACH_SELECTED_OBJECT_END; CTX_data_type_set(result, CTX_DATA_TYPE_COLLECTION); return 1; } @@ -148,7 +148,7 @@ int ed_screen_context(const bContext *C, const char *member, bContextDataResult CTX_data_id_list_add(result, &ob->id); } } - FOREACH_VISIBLE_OBJECT_END + FOREACH_VISIBLE_OBJECT_END; CTX_data_type_set(result, CTX_DATA_TYPE_COLLECTION); return 1; } @@ -157,7 +157,7 @@ int ed_screen_context(const bContext *C, const char *member, bContextDataResult { CTX_data_list_add(result, &scene->id, &RNA_ObjectBase, base); } - FOREACH_VISIBLE_BASE_END + FOREACH_VISIBLE_BASE_END; CTX_data_type_set(result, CTX_DATA_TYPE_COLLECTION); return 1; } diff --git a/source/blender/editors/space_clip/tracking_ops_orient.c b/source/blender/editors/space_clip/tracking_ops_orient.c index e109a54c5e1..49cfc4b71b0 100644 --- a/source/blender/editors/space_clip/tracking_ops_orient.c +++ b/source/blender/editors/space_clip/tracking_ops_orient.c @@ -80,7 +80,7 @@ static Object *get_camera_with_movieclip(Scene *scene, MovieClip *clip) } } } - FOREACH_SCENE_OBJECT_END + FOREACH_SCENE_OBJECT_END; return camera; } diff --git a/source/blender/editors/space_outliner/outliner_select.c b/source/blender/editors/space_outliner/outliner_select.c index 29f5445a7a0..e720eedbb22 100644 --- a/source/blender/editors/space_outliner/outliner_select.c +++ b/source/blender/editors/space_outliner/outliner_select.c @@ -937,7 +937,7 @@ static void do_outliner_item_activate_tree_element( { ED_object_base_select(BKE_view_layer_base_find(view_layer, object), sel); } - FOREACH_GROUP_OBJECT_END + FOREACH_GROUP_OBJECT_END; } else { BKE_view_layer_base_deselect_all(view_layer); @@ -952,7 +952,7 @@ static void do_outliner_item_activate_tree_element( } } } - FOREACH_GROUP_OBJECT_END + FOREACH_GROUP_OBJECT_END; } WM_event_add_notifier(C, NC_SCENE | ND_OB_SELECT, scene); diff --git a/source/blender/editors/space_outliner/outliner_tools.c b/source/blender/editors/space_outliner/outliner_tools.c index 4dbc7ac47ef..c30b14d43fa 100644 --- a/source/blender/editors/space_outliner/outliner_tools.c +++ b/source/blender/editors/space_outliner/outliner_tools.c @@ -553,7 +553,7 @@ static void group_linkobs2scene_cb( base->flag |= BASE_SELECTED; } - FOREACH_GROUP_OBJECT_END + FOREACH_GROUP_OBJECT_END; } static void group_instance_cb( diff --git a/source/blender/editors/space_outliner/outliner_tree.c b/source/blender/editors/space_outliner/outliner_tree.c index 7d3fa147355..8c6d7783f01 100644 --- a/source/blender/editors/space_outliner/outliner_tree.c +++ b/source/blender/editors/space_outliner/outliner_tree.c @@ -2384,7 +2384,7 @@ void outliner_build_tree( { outliner_add_element(soops, eval_ctx, &soops->tree, ob, NULL, 0, 0); } - FOREACH_SCENE_OBJECT_END + FOREACH_SCENE_OBJECT_END; outliner_make_hierarchy(&soops->tree); } else { diff --git a/source/blender/editors/space_view3d/view3d_ops.c b/source/blender/editors/space_view3d/view3d_ops.c index 5ab0ac9464d..8e6f5228b09 100644 --- a/source/blender/editors/space_view3d/view3d_ops.c +++ b/source/blender/editors/space_view3d/view3d_ops.c @@ -91,7 +91,7 @@ static int view3d_copybuffer_exec(bContext *C, wmOperator *op) break; } } - FOREACH_GROUP_OBJECT_END + FOREACH_GROUP_OBJECT_END; } BLI_make_file_string("/", str, BKE_tempdir_base(), "copybuffer.blend"); |