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/draw/intern | |
| 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/draw/intern')
| -rw-r--r-- | source/blender/draw/intern/draw_manager.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/source/blender/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c index 53dfa429abf..8ca5ee8f577 100644 --- a/source/blender/draw/intern/draw_manager.c +++ b/source/blender/draw/intern/draw_manager.c @@ -1112,7 +1112,7 @@ void DRW_draw_render_loop_ex( { drw_engines_cache_populate(ob); } - DEG_OBJECT_ITER_FOR_RENDER_ENGINE_END + DEG_OBJECT_ITER_FOR_RENDER_ENGINE_END; drw_engines_cache_finish(); @@ -1485,17 +1485,18 @@ void DRW_draw_select_loop( drw_engines_cache_populate(obact); } else { - DEG_OBJECT_ITER_BEGIN(depsgraph, ob, DRW_iterator_mode_get(), - DEG_ITER_OBJECT_FLAG_LINKED_DIRECTLY | - DEG_ITER_OBJECT_FLAG_VISIBLE | - DEG_ITER_OBJECT_FLAG_DUPLI) + DEG_OBJECT_ITER_BEGIN( + depsgraph, ob, DRW_iterator_mode_get(), + DEG_ITER_OBJECT_FLAG_LINKED_DIRECTLY | + DEG_ITER_OBJECT_FLAG_VISIBLE | + DEG_ITER_OBJECT_FLAG_DUPLI) { if ((ob->base_flag & BASE_SELECTABLED) != 0) { DRW_select_load_id(ob->select_color); drw_engines_cache_populate(ob); } } - DEG_OBJECT_ITER_END + DEG_OBJECT_ITER_END; } drw_engines_cache_finish(); @@ -1661,7 +1662,7 @@ void DRW_draw_depth_loop( { drw_engines_cache_populate(ob); } - DEG_OBJECT_ITER_FOR_RENDER_ENGINE_END + DEG_OBJECT_ITER_FOR_RENDER_ENGINE_END; drw_engines_cache_finish(); |