From 37242e6b0b1897b3d265a25684eacccfec36ffd0 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 21 Jan 2014 01:19:51 +1100 Subject: Code Cleanup: style --- source/blender/blenkernel/intern/writeffmpeg.c | 8 +++++--- source/blender/blenlib/intern/sort.c | 6 +++--- source/blender/bmesh/tools/bmesh_bevel.c | 9 +++++++-- source/blender/editors/space_image/image_ops.c | 2 +- source/blender/editors/space_node/node_edit.c | 3 ++- source/blender/editors/transform/transform_conversions.c | 7 ++++--- source/blender/makesdna/DNA_userdef_types.h | 2 +- 7 files changed, 23 insertions(+), 14 deletions(-) (limited to 'source/blender') diff --git a/source/blender/blenkernel/intern/writeffmpeg.c b/source/blender/blenkernel/intern/writeffmpeg.c index ff4300c34e9..713f970f1e5 100644 --- a/source/blender/blenkernel/intern/writeffmpeg.c +++ b/source/blender/blenkernel/intern/writeffmpeg.c @@ -606,9 +606,11 @@ static AVStream *alloc_video_stream(RenderData *rd, int codec_id, AVFormatContex } if ((of->oformat->flags & AVFMT_GLOBALHEADER) -// || !strcmp(of->oformat->name, "mp4") -// || !strcmp(of->oformat->name, "mov") -// || !strcmp(of->oformat->name, "3gp") +#if 0 + || !strcmp(of->oformat->name, "mp4") + || !strcmp(of->oformat->name, "mov") + || !strcmp(of->oformat->name, "3gp") +#endif ) { PRINT("Using global header\n"); diff --git a/source/blender/blenlib/intern/sort.c b/source/blender/blenlib/intern/sort.c index 44110564948..a1b7296feb6 100644 --- a/source/blender/blenlib/intern/sort.c +++ b/source/blender/blenlib/intern/sort.c @@ -76,9 +76,9 @@ BLI_INLINE void swapfunc(char *a, char *b, int n, int swaptype) BLI_INLINE char *med3(char *a, char *b, char *c, BLI_sort_cmp_t cmp, void *thunk) { - return CMP(thunk, a, b) < 0 ? - (CMP(thunk, b, c) < 0 ? b : (CMP(thunk, a, c) < 0 ? c : a )) - :(CMP(thunk, b, c) > 0 ? b : (CMP(thunk, a, c) < 0 ? a : c )); + return CMP(thunk, a, b) < 0 ? + (CMP(thunk, b, c) < 0 ? b : (CMP(thunk, a, c) < 0 ? c : a )) : + (CMP(thunk, b, c) > 0 ? b : (CMP(thunk, a, c) < 0 ? a : c )); } /** diff --git a/source/blender/bmesh/tools/bmesh_bevel.c b/source/blender/bmesh/tools/bmesh_bevel.c index 8ae71c24c67..3f71a6aa8a9 100644 --- a/source/blender/bmesh/tools/bmesh_bevel.c +++ b/source/blender/bmesh/tools/bmesh_bevel.c @@ -2984,12 +2984,17 @@ static void build_vmesh(BevelParams *bp, BMesh *bm, BevVert *bv) * just use the boundary point of the other */ if (weld1->profile.super_r == PRO_LINE_R && weld2->profile.super_r != PRO_LINE_R) + { copy_v3_v3(co, vb); + } else if (weld2->profile.super_r == PRO_LINE_R && - weld1->profile.super_r != PRO_LINE_R) + weld1->profile.super_r != PRO_LINE_R) + { copy_v3_v3(co, va); - else + } + else { mid_v3_v3v3(co, va, vb); + } copy_v3_v3(mesh_vert(vm, weld1->index, 0, k)->co, co); create_mesh_bmvert(bm, vm, weld1->index, 0, k, bv->v); } diff --git a/source/blender/editors/space_image/image_ops.c b/source/blender/editors/space_image/image_ops.c index b4d98b0d829..c7a89811573 100644 --- a/source/blender/editors/space_image/image_ops.c +++ b/source/blender/editors/space_image/image_ops.c @@ -972,7 +972,7 @@ static void image_sequence_get_frames(PointerRNA *ptr, ListBase *frames, char *p /* still in the same sequence */ if ((STREQLEN(base_head, head, FILE_MAX)) && - (STREQLEN(base_tail, tail, FILE_MAX))) + (STREQLEN(base_tail, tail, FILE_MAX))) { BLI_addtail(frames, frame); } diff --git a/source/blender/editors/space_node/node_edit.c b/source/blender/editors/space_node/node_edit.c index ee18f945316..a1d5a1b9b81 100644 --- a/source/blender/editors/space_node/node_edit.c +++ b/source/blender/editors/space_node/node_edit.c @@ -655,7 +655,8 @@ void ED_node_set_active(Main *bmain, bNodeTree *ntree, bNode *node) nodeClearActiveID(ntree, ID_TE); if (ELEM4(node->type, SH_NODE_OUTPUT, SH_NODE_OUTPUT_MATERIAL, - SH_NODE_OUTPUT_WORLD, SH_NODE_OUTPUT_LAMP)) { + SH_NODE_OUTPUT_WORLD, SH_NODE_OUTPUT_LAMP)) + { bNode *tnode; for (tnode = ntree->nodes.first; tnode; tnode = tnode->next) diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c index 0eddb68d8a4..1c7ecbc95e7 100644 --- a/source/blender/editors/transform/transform_conversions.c +++ b/source/blender/editors/transform/transform_conversions.c @@ -2395,14 +2395,15 @@ void flushTransNodes(TransInfo *t) node->locy = td2d->loc[1] / dpi_fac; #endif /* update node hidden state with transform data TD_HIDDEN + transformInfo T_TOGGLE_HIDDEN */ - hidden_state = (td->flag & TD_HIDDEN) > 0; + hidden_state = (td->flag & TD_HIDDEN) != 0; if (t->state != TRANS_CANCEL) { hidden_state ^= (t->flag & T_TOGGLE_HIDDEN) > 0; } if (hidden_state) { node->flag |= NODE_HIDDEN; - } else { + } + else { node->flag &= ~NODE_HIDDEN; } } @@ -5999,7 +6000,7 @@ static void NodeToTransData(TransData *td, TransData2D *td2d, bNode *node, const td->ext = NULL; td->val = NULL; td->flag |= TD_SELECTED; - if(node->flag & NODE_HIDDEN){ + if (node->flag & NODE_HIDDEN) { td->flag |= TD_HIDDEN; } td->dist = 0.0; diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h index 8f0adc7d39e..864cc8170d6 100644 --- a/source/blender/makesdna/DNA_userdef_types.h +++ b/source/blender/makesdna/DNA_userdef_types.h @@ -251,7 +251,7 @@ typedef struct ThemeSpace { char ds_channel[4], ds_subchannel[4]; /* dopesheet */ char keytype_keyframe[4], keytype_extreme[4], keytype_breakdown[4], keytype_jitter[4]; /* keytypes */ char keytype_keyframe_select[4], keytype_extreme_select[4], keytype_breakdown_select[4], keytype_jitter_select[4]; /* keytypes */ - char keyborder[4],keyborder_select[4]; + char keyborder[4], keyborder_select[4]; char console_output[4], console_input[4], console_info[4], console_error[4]; char console_cursor[4], console_select[4], pad1[4]; -- cgit v1.2.3