diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-04-20 21:40:16 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-04-20 21:40:16 +0300 |
commit | 2fb9c8ef125f975596b6ef9c8f021403f8279bdf (patch) | |
tree | 02633f97a682dcd4935bf9b3170dfe5841ed048a /source/blender/draw | |
parent | 6b9ce24338de1a33dbf41e14e85a1630b1a2b899 (diff) |
Cleanup: add missing macros to clang-format
Diffstat (limited to 'source/blender/draw')
-rw-r--r-- | source/blender/draw/intern/draw_cache_impl_mesh.c | 6 | ||||
-rw-r--r-- | source/blender/draw/intern/draw_manager_exec.c | 15 |
2 files changed, 9 insertions, 12 deletions
diff --git a/source/blender/draw/intern/draw_cache_impl_mesh.c b/source/blender/draw/intern/draw_cache_impl_mesh.c index a433135e8b9..b4b57237943 100644 --- a/source/blender/draw/intern/draw_cache_impl_mesh.c +++ b/source/blender/draw/intern/draw_cache_impl_mesh.c @@ -4429,8 +4429,7 @@ BLI_INLINE void edit_uv_preprocess_stretch_angle(float (*auv)[2], BMLoop *l; BMIter liter; int i; - BM_ITER_ELEM_INDEX(l, &liter, efa, BM_LOOPS_OF_FACE, i) - { + BM_ITER_ELEM_INDEX (l, &liter, efa, BM_LOOPS_OF_FACE, i) { MLoopUV *luv = BM_ELEM_CD_GET_VOID_P(l, cd_loop_uv_offset); MLoopUV *luv_prev = BM_ELEM_CD_GET_VOID_P(l->prev, cd_loop_uv_offset); @@ -4529,8 +4528,7 @@ static void uvedit_fill_buffer_data(MeshRenderData *rdata, } } - BM_ITER_ELEM_INDEX(l, &liter, efa, BM_LOOPS_OF_FACE, i) - { + BM_ITER_ELEM_INDEX (l, &liter, efa, BM_LOOPS_OF_FACE, i) { MLoopUV *luv = BM_ELEM_CD_GET_VOID_P(l, cd_loop_uv_offset); if (vbo_area) { GPU_vertbuf_attr_set(vbo_area, uv_attr_id.area, vidx, &area_stretch); diff --git a/source/blender/draw/intern/draw_manager_exec.c b/source/blender/draw/intern/draw_manager_exec.c index 79c1d77bbf1..15e7c2389b8 100644 --- a/source/blender/draw/intern/draw_manager_exec.c +++ b/source/blender/draw/intern/draw_manager_exec.c @@ -1231,12 +1231,13 @@ static void draw_shgroup(DRWShadingGroup *shgroup, DRWState pass_state) # define GPU_SELECT_LOAD_IF_PICKSEL_LIST_END(_start, _count) \ _start += _count; \ - } + } \ + ((void)0) #else # define GPU_SELECT_LOAD_IF_PICKSEL(select_id) # define GPU_SELECT_LOAD_IF_PICKSEL_CALL(call) -# define GPU_SELECT_LOAD_IF_PICKSEL_LIST_END(start, count) +# define GPU_SELECT_LOAD_IF_PICKSEL_LIST_END(start, count) ((void)0) # define GPU_SELECT_LOAD_IF_PICKSEL_LIST(_shgroup, _start, _count) \ _start = 0; \ _count = _shgroup->instance_count; @@ -1260,11 +1261,10 @@ static void draw_shgroup(DRWShadingGroup *shgroup, DRWState pass_state) if (shgroup->instance_count > 0) { uint count, start; draw_geometry_prepare(shgroup, NULL); - GPU_SELECT_LOAD_IF_PICKSEL_LIST(shgroup, start, count) - { + GPU_SELECT_LOAD_IF_PICKSEL_LIST (shgroup, start, count) { draw_geometry_execute_ex(shgroup, shgroup->instance_geom, start, count, true); } - GPU_SELECT_LOAD_IF_PICKSEL_LIST_END(start, count) + GPU_SELECT_LOAD_IF_PICKSEL_LIST_END(start, count); } } } @@ -1273,11 +1273,10 @@ static void draw_shgroup(DRWShadingGroup *shgroup, DRWState pass_state) if (shgroup->instance_count > 0) { uint count, start; draw_geometry_prepare(shgroup, NULL); - GPU_SELECT_LOAD_IF_PICKSEL_LIST(shgroup, start, count) - { + GPU_SELECT_LOAD_IF_PICKSEL_LIST (shgroup, start, count) { draw_geometry_execute_ex(shgroup, shgroup->batch_geom, start, count, false); } - GPU_SELECT_LOAD_IF_PICKSEL_LIST_END(start, count) + GPU_SELECT_LOAD_IF_PICKSEL_LIST_END(start, count); } } } |