blender
/
blender
134
400
Fork 583
Code Issues 6.3k Pull Requests 758 Projects 19 Wiki Activity

Cleanup: indentation

This commit is contained in:
Campbell Barton 2018-04-16 17:16:29 +02:00
parent 85de548e03
commit 95eb9f22e6
9 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/blenlib/BLI_utildefines_stack.h
View File

@ -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__ */

4
source/blender/blenloader/intern/readfile.c
View File

@ -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);

4
source/blender/bmesh/intern/bmesh_mesh.h
View File

@ -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__)

6
source/blender/bmesh/intern/bmesh_opdefines.c
View File

@ -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 |

2
source/blender/freestyle/intern/stroke/CurveAdvancedIterators.h
View File

@ -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

6
source/blender/freestyle/intern/view_map/ViewMapAdvancedIterators.h
View File

@ -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.

2
source/blender/freestyle/intern/winged_edge/WingedEdgeBuilder.h
View File

@ -113,7 +113,7 @@ public:
#endif
inline void setRenderMonitor(RenderMonitor *iRenderMonitor) {
_pRenderMonitor = iRenderMonitor;
_pRenderMonitor = iRenderMonitor;
}
protected:

2
source/blender/imbuf/intern/jp2.c
View File

@ -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])
{

2
source/blender/makesrna/intern/rna_mesh_utils.h
View File

@ -85,7 +85,7 @@
} \
else { \
layer = NULL; \
} \
} \
return rna_pointer_inherit_refine(ptr, &RNA_##layer_rna_type, layer); \
} \
\