diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-03-01 11:00:54 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-03-01 11:01:53 +0300 |
| commit | 7aed2de798b1e5f8663e8fe608a99f6c9f53c382 (patch) | |
| tree | 1f811fd3d80e3cce969db7e317b5629e54cbe5ce /source/blender/blenkernel/BKE_layer.h | |
| parent | 1fc5eb305a2bd61ed465db376cec73a3822c0bf6 (diff) | |
Cleanup: macro's w/ an _END need a matching _BEGIN
Convention from 2.7x, since some looping macros don't need an '_END',
it avoids confusion to keep this.
Diffstat (limited to 'source/blender/blenkernel/BKE_layer.h')
| -rw-r--r-- | source/blender/blenkernel/BKE_layer.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/blenkernel/BKE_layer.h b/source/blender/blenkernel/BKE_layer.h index 17b854e5bf7..d9c9041f330 100644 --- a/source/blender/blenkernel/BKE_layer.h +++ b/source/blender/blenkernel/BKE_layer.h @@ -199,7 +199,7 @@ void BKE_visible_bases_iterator_begin(BLI_Iterator *iter, void *data_in); void BKE_visible_bases_iterator_next(BLI_Iterator *iter); void BKE_visible_bases_iterator_end(BLI_Iterator *iter); -#define FOREACH_SELECTED_OBJECT(view_layer, _instance) \ +#define FOREACH_SELECTED_OBJECT_BEGIN(view_layer, _instance) \ ITER_BEGIN(BKE_selected_objects_iterator_begin, \ BKE_selected_objects_iterator_next, \ BKE_selected_objects_iterator_end, \ @@ -208,7 +208,7 @@ void BKE_visible_bases_iterator_end(BLI_Iterator *iter); #define FOREACH_SELECTED_OBJECT_END \ ITER_END -#define FOREACH_VISIBLE_OBJECT(view_layer, _instance) \ +#define FOREACH_VISIBLE_OBJECT_BEGIN(view_layer, _instance) \ ITER_BEGIN(BKE_visible_objects_iterator_begin, \ BKE_visible_objects_iterator_next, \ BKE_visible_objects_iterator_end, \ @@ -217,7 +217,7 @@ void BKE_visible_bases_iterator_end(BLI_Iterator *iter); #define FOREACH_VISIBLE_OBJECT_END \ ITER_END -#define FOREACH_SELECTED_BASE(view_layer, _instance) \ +#define FOREACH_SELECTED_BASE_BEGIN(view_layer, _instance) \ ITER_BEGIN(BKE_selected_bases_iterator_begin, \ BKE_selected_bases_iterator_next, \ BKE_selected_bases_iterator_end, \ @@ -226,7 +226,7 @@ void BKE_visible_bases_iterator_end(BLI_Iterator *iter); #define FOREACH_SELECTED_BASE_END \ ITER_END -#define FOREACH_VISIBLE_BASE(view_layer, _instance) \ +#define FOREACH_VISIBLE_BASE_BEGIN(view_layer, _instance) \ ITER_BEGIN(BKE_visible_bases_iterator_begin, \ BKE_visible_bases_iterator_next, \ BKE_visible_bases_iterator_end, \ @@ -236,7 +236,7 @@ void BKE_visible_bases_iterator_end(BLI_Iterator *iter); ITER_END -#define FOREACH_OBJECT(view_layer, _instance) \ +#define FOREACH_OBJECT_BEGIN(view_layer, _instance) \ { \ Object *_instance; \ Base *_base; \ @@ -247,7 +247,7 @@ void BKE_visible_bases_iterator_end(BLI_Iterator *iter); } \ } -#define FOREACH_OBJECT_FLAG(scene, view_layer, flag, _instance) \ +#define FOREACH_OBJECT_FLAG_BEGIN(scene, view_layer, flag, _instance) \ { \ IteratorBeginCb func_begin; \ IteratorCb func_next, func_end; \ @@ -284,7 +284,7 @@ typedef struct ObjectsRenderableIteratorData { } iter; } ObjectsRenderableIteratorData; -#define FOREACH_OBJECT_RENDERABLE(scene_, _instance) \ +#define FOREACH_OBJECT_RENDERABLE_BEGIN(scene_, _instance) \ ObjectsRenderableIteratorData data_ = { \ .scene = (scene_), \ }; \ |