From 95eb9f22e69622c5817707fa9534521613e7d7cc Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 16 Apr 2018 17:16:29 +0200 Subject: Cleanup: indentation --- source/blender/blenlib/BLI_utildefines_stack.h | 4 ++-- source/blender/blenloader/intern/readfile.c | 4 ++-- source/blender/bmesh/intern/bmesh_mesh.h | 4 ++-- source/blender/bmesh/intern/bmesh_opdefines.c | 6 +++--- source/blender/freestyle/intern/stroke/CurveAdvancedIterators.h | 2 +- source/blender/freestyle/intern/view_map/ViewMapAdvancedIterators.h | 6 +++--- source/blender/freestyle/intern/winged_edge/WingedEdgeBuilder.h | 2 +- source/blender/imbuf/intern/jp2.c | 2 +- source/blender/makesrna/intern/rna_mesh_utils.h | 2 +- 9 files changed, 16 insertions(+), 16 deletions(-) (limited to 'source/blender') diff --git a/source/blender/blenlib/BLI_utildefines_stack.h b/source/blender/blenlib/BLI_utildefines_stack.h index 15b0029e727..224add91504 100644 --- a/source/blender/blenlib/BLI_utildefines_stack.h +++ b/source/blender/blenlib/BLI_utildefines_stack.h @@ -77,13 +77,13 @@ SWAP(typeof(stack_a), stack_a, stack_b); \ SWAP(unsigned int, _##stack_a##_index, _##stack_b##_index); \ _STACK_SWAP_TOTALLOC(stack_a, stack_b); \ - } ((void)0) +} ((void)0) #else #define STACK_SWAP(stack_a, stack_b) { \ SWAP(void *, stack_a, stack_b); \ SWAP(unsigned int, _##stack_a##_index, _##stack_b##_index); \ _STACK_SWAP_TOTALLOC(stack_a, stack_b); \ - } ((void)0) +} ((void)0) #endif #endif /* __BLI_UTILDEFINES_STACK_H__ */ diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index a4739240cb4..1586a03b25d 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -3720,8 +3720,8 @@ static void direct_link_text(FileData *fd, Text *text) #if 0 if (text->flags & TXT_ISEXT) { BKE_text_reload(text); - } - /* else { */ + } + /* else { */ #endif link_list(fd, &text->lines); diff --git a/source/blender/bmesh/intern/bmesh_mesh.h b/source/blender/bmesh/intern/bmesh_mesh.h index 10f024423aa..d449aac04f5 100644 --- a/source/blender/bmesh/intern/bmesh_mesh.h +++ b/source/blender/bmesh/intern/bmesh_mesh.h @@ -119,7 +119,7 @@ extern const BMAllocTemplate bm_mesh_chunksize_default; (dm)->getNumEdges(dm), \ (dm)->getNumLoops(dm), \ (dm)->getNumPolys(dm), \ - } +} #define _VA_BMALLOC_TEMPLATE_FROM_DM_2(dm_a, dm_b) { \ (CHECK_TYPE_INLINE(dm_a, DerivedMesh *), \ CHECK_TYPE_INLINE(dm_b, DerivedMesh *), \ @@ -127,7 +127,7 @@ extern const BMAllocTemplate bm_mesh_chunksize_default; (dm_a)->getNumEdges(dm_a) + (dm_b)->getNumEdges(dm_b), \ (dm_a)->getNumLoops(dm_a) + (dm_b)->getNumLoops(dm_b), \ (dm_a)->getNumPolys(dm_a) + (dm_b)->getNumPolys(dm_b), \ - } +} #define BMALLOC_TEMPLATE_FROM_DM(...) VA_NARGS_CALL_OVERLOAD(_VA_BMALLOC_TEMPLATE_FROM_DM_, __VA_ARGS__) diff --git a/source/blender/bmesh/intern/bmesh_opdefines.c b/source/blender/bmesh/intern/bmesh_opdefines.c index a339a4d5734..b5e6fe168e5 100644 --- a/source/blender/bmesh/intern/bmesh_opdefines.c +++ b/source/blender/bmesh/intern/bmesh_opdefines.c @@ -112,7 +112,7 @@ static BMOpDefine bmo_smooth_vert_def = { {"use_axis_x", BMO_OP_SLOT_BOOL}, /* smooth vertices along X axis */ {"use_axis_y", BMO_OP_SLOT_BOOL}, /* smooth vertices along Y axis */ {"use_axis_z", BMO_OP_SLOT_BOOL}, /* smooth vertices along Z axis */ - {{'\0'}}, + {{'\0'}}, }, {{{'\0'}}}, /* no output */ bmo_smooth_vert_exec, @@ -135,7 +135,7 @@ static BMOpDefine bmo_smooth_laplacian_vert_def = { {"use_y", BMO_OP_SLOT_BOOL}, /* Smooth object along Y axis */ {"use_z", BMO_OP_SLOT_BOOL}, /* Smooth object along Z axis */ {"preserve_volume", BMO_OP_SLOT_BOOL}, /* Apply volume preservation after smooth */ - {{'\0'}}, + {{'\0'}}, }, {{{'\0'}}}, /* no output */ bmo_smooth_laplacian_vert_exec, @@ -1337,7 +1337,7 @@ static BMOpDefine bmo_duplicate_def = { {"face_map.out", BMO_OP_SLOT_MAPPING, {(int)BMO_OP_SLOT_SUBTYPE_MAP_ELEM}}, {"boundary_map.out", BMO_OP_SLOT_MAPPING, {(int)BMO_OP_SLOT_SUBTYPE_MAP_ELEM}}, {"isovert_map.out", BMO_OP_SLOT_MAPPING, {(int)BMO_OP_SLOT_SUBTYPE_MAP_ELEM}}, - {{'\0'}}, + {{'\0'}}, }, bmo_duplicate_exec, (BMO_OPTYPE_FLAG_NORMALS_CALC | diff --git a/source/blender/freestyle/intern/stroke/CurveAdvancedIterators.h b/source/blender/freestyle/intern/stroke/CurveAdvancedIterators.h index 956842580c5..4142117c361 100644 --- a/source/blender/freestyle/intern/stroke/CurveAdvancedIterators.h +++ b/source/blender/freestyle/intern/stroke/CurveAdvancedIterators.h @@ -275,7 +275,7 @@ protected: { if (_Point != 0) { delete _Point; - _Point = 0; + _Point = 0; } if ((_currentn == _n - 1) && (_t == 1.0f)) { // we're setting the iterator to end diff --git a/source/blender/freestyle/intern/view_map/ViewMapAdvancedIterators.h b/source/blender/freestyle/intern/view_map/ViewMapAdvancedIterators.h index 8e98cabd75b..a3a0b5cbaeb 100644 --- a/source/blender/freestyle/intern/view_map/ViewMapAdvancedIterators.h +++ b/source/blender/freestyle/intern/view_map/ViewMapAdvancedIterators.h @@ -555,9 +555,9 @@ public: // operators // operator corresponding to ++i. inline Self& operator++() - { - increment(); - return *this; + { + increment(); + return *this; } // operator corresponding to i++, i.e. which returns the value *and then* increments it. diff --git a/source/blender/freestyle/intern/winged_edge/WingedEdgeBuilder.h b/source/blender/freestyle/intern/winged_edge/WingedEdgeBuilder.h index 5683b39fd28..601c208b137 100644 --- a/source/blender/freestyle/intern/winged_edge/WingedEdgeBuilder.h +++ b/source/blender/freestyle/intern/winged_edge/WingedEdgeBuilder.h @@ -113,7 +113,7 @@ public: #endif inline void setRenderMonitor(RenderMonitor *iRenderMonitor) { - _pRenderMonitor = iRenderMonitor; + _pRenderMonitor = iRenderMonitor; } protected: diff --git a/source/blender/imbuf/intern/jp2.c b/source/blender/imbuf/intern/jp2.c index 388c2734fe9..30a0fdf4e55 100644 --- a/source/blender/imbuf/intern/jp2.c +++ b/source/blender/imbuf/intern/jp2.c @@ -119,7 +119,7 @@ static void info_callback(const char *msg, void *client_data) # define PIXEL_LOOPER_END \ } \ - } (void)0 \ +} (void)0 \ struct ImBuf *imb_jp2_decode(const unsigned char *mem, size_t size, int flags, char colorspace[IM_MAX_SPACE]) { diff --git a/source/blender/makesrna/intern/rna_mesh_utils.h b/source/blender/makesrna/intern/rna_mesh_utils.h index 0f42596ff13..93b3fd6579e 100644 --- a/source/blender/makesrna/intern/rna_mesh_utils.h +++ b/source/blender/makesrna/intern/rna_mesh_utils.h @@ -85,7 +85,7 @@ } \ else { \ layer = NULL; \ - } \ + } \ return rna_pointer_inherit_refine(ptr, &RNA_##layer_rna_type, layer); \ } \ \ -- cgit v1.2.3