diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-03-09 03:44:42 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-03-09 03:52:11 +0300 |
commit | f47a41a3d9f9850f852abb3d76bea2c8b281bb45 (patch) | |
tree | b50d618fa0300e4ae96a5cf7d3029013515c5e93 /source/blender/blenkernel/BKE_layer.h | |
parent | 9342f55d12f87dbc72e6953e0bc6c2564e57465f (diff) |
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.
Diffstat (limited to 'source/blender/blenkernel/BKE_layer.h')
-rw-r--r-- | source/blender/blenkernel/BKE_layer.h | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/source/blender/blenkernel/BKE_layer.h b/source/blender/blenkernel/BKE_layer.h index d9c9041f330..59aec53aa1e 100644 --- a/source/blender/blenkernel/BKE_layer.h +++ b/source/blender/blenkernel/BKE_layer.h @@ -245,7 +245,7 @@ void BKE_visible_bases_iterator_end(BLI_Iterator *iter); #define FOREACH_OBJECT_END \ } \ -} +} ((void)0) #define FOREACH_OBJECT_FLAG_BEGIN(scene, view_layer, flag, _instance) \ { \ @@ -269,10 +269,10 @@ void BKE_visible_bases_iterator_end(BLI_Iterator *iter); #define FOREACH_OBJECT_FLAG_END \ - ITER_END \ -} + ITER_END; \ +} ((void)0) -typedef struct ObjectsRenderableIteratorData { +struct ObjectsRenderableIteratorData { struct Scene *scene; struct Base base_temp; struct Scene scene_temp; @@ -282,10 +282,11 @@ typedef struct ObjectsRenderableIteratorData { struct Base *base; struct Scene *set; } iter; -} ObjectsRenderableIteratorData; +}; #define FOREACH_OBJECT_RENDERABLE_BEGIN(scene_, _instance) \ - ObjectsRenderableIteratorData data_ = { \ +{ \ + struct ObjectsRenderableIteratorData data_ = { \ .scene = (scene_), \ }; \ ITER_BEGIN(BKE_renderable_objects_iterator_begin, \ @@ -295,7 +296,8 @@ typedef struct ObjectsRenderableIteratorData { #define FOREACH_OBJECT_RENDERABLE_END \ - ITER_END + ITER_END; \ +} ((void)0) #ifdef __cplusplus } |