From f47a41a3d9f9850f852abb3d76bea2c8b281bb45 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 9 Mar 2018 11:44:42 +1100 Subject: Cleanup: iterator macros - put render iterator in own scope (would shadow it's own variable if used multiple times). - enforce semicolon at end of iterator macros. - no need to typedef one-off macro structs. --- source/blender/editors/space_outliner/outliner_select.c | 4 ++-- source/blender/editors/space_outliner/outliner_tools.c | 2 +- source/blender/editors/space_outliner/outliner_tree.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'source/blender/editors/space_outliner') 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 { -- cgit v1.2.3