From 032d83ecc411428a768e0b405fe73066dc6640ea Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sun, 27 May 2012 20:13:59 +0000 Subject: style cleanup: defines with braces --- source/blender/editors/animation/anim_channels_defines.c | 2 +- source/blender/editors/animation/fmodifier_ui.c | 2 +- source/blender/editors/animation/keyframes_edit.c | 4 ++-- source/blender/editors/gpencil/gpencil_paint.c | 2 +- source/blender/editors/space_buttons/buttons_header.c | 4 ++-- source/blender/editors/space_view3d/drawobject.c | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) (limited to 'source/blender/editors') diff --git a/source/blender/editors/animation/anim_channels_defines.c b/source/blender/editors/animation/anim_channels_defines.c index 9bbba20c15e..08672a22666 100644 --- a/source/blender/editors/animation/anim_channels_defines.c +++ b/source/blender/editors/animation/anim_channels_defines.c @@ -2699,7 +2699,7 @@ short ANIM_channel_setting_get(bAnimContext *ac, bAnimListElem *ale, int setting else if (smode == ACHANNEL_SETFLAG_ADD) (sval) |= (sflag); \ else (sval) &= ~(sflag); \ } \ - } + } (void)0 /* Change value of some setting for a channel * - setting: eAnimChannel_Settings diff --git a/source/blender/editors/animation/fmodifier_ui.c b/source/blender/editors/animation/fmodifier_ui.c index 24cae5d8652..ea875567705 100644 --- a/source/blender/editors/animation/fmodifier_ui.c +++ b/source/blender/editors/animation/fmodifier_ui.c @@ -79,7 +79,7 @@ #define DRAW_BACKDROP(height) \ { \ uiDefBut(block, ROUNDBOX, B_REDR, "", -3, yco - height, width + 3, height - 1, NULL, 5.0, 0.0, 12.0, (float)rb_col, ""); \ - } + } (void)0 /* callback to verify modifier data */ static void validate_fmodifier_cb(bContext *UNUSED(C), void *fcm_v, void *UNUSED(arg)) diff --git a/source/blender/editors/animation/keyframes_edit.c b/source/blender/editors/animation/keyframes_edit.c index b92d0fb345a..88627a6dabd 100644 --- a/source/blender/editors/animation/keyframes_edit.c +++ b/source/blender/editors/animation/keyframes_edit.c @@ -429,7 +429,7 @@ void ANIM_editkeyframes_refresh(bAnimContext *ac) if (check(2)) \ ok |= KEYFRAME_OK_H2; \ } \ - } + } (void)0 /* ------------------------ */ @@ -766,7 +766,7 @@ KeyframeEditFunc ANIM_editkeyframes_mirror(short type) bezt->h1 = HD_FREE; \ if (ELEM3(bezt->h2, HD_ALIGN, HD_AUTO, HD_AUTO_ANIM)) \ bezt->h2 = HD_FREE; \ - } + } (void)0 /* Sets the selected bezier handles to type 'auto' */ static short set_bezier_auto(KeyframeEditData *UNUSED(ked), BezTriple *bezt) diff --git a/source/blender/editors/gpencil/gpencil_paint.c b/source/blender/editors/gpencil/gpencil_paint.c index 6ffe3f1feeb..3e569f8eb96 100644 --- a/source/blender/editors/gpencil/gpencil_paint.c +++ b/source/blender/editors/gpencil/gpencil_paint.c @@ -525,7 +525,7 @@ static void gp_stroke_simplify(tGPsdata *p) co[0] += (float)(old_points[offs].x * sfac); \ co[1] += (float)(old_points[offs].y * sfac); \ pressure += old_points[offs].pressure * sfac; \ - } + } (void)0 for (i = 0, j = 0; i < num_points; i++) { if (i - j == 3) { diff --git a/source/blender/editors/space_buttons/buttons_header.c b/source/blender/editors/space_buttons/buttons_header.c index 661f7ad7d0f..b13ba9a1aa3 100644 --- a/source/blender/editors/space_buttons/buttons_header.c +++ b/source/blender/editors/space_buttons/buttons_header.c @@ -125,9 +125,9 @@ void buttons_header_buttons(const bContext *C, ARegion *ar) if (sbuts->pathflag & (1 << _ctx)) { \ but = uiDefIconButS(block, ROW, B_CONTEXT_SWITCH, _icon, xco += BUT_UNIT_X, yco, BUT_UNIT_X, UI_UNIT_Y, &(sbuts->mainb), 0.0, (float)_ctx, 0, 0, TIP_(_tip)); \ uiButClearFlag(but, UI_BUT_UNDO); \ - } \ + } (void)0 - BUTTON_HEADER_CTX(BCONTEXT_RENDER, ICON_SCENE, N_("Render")) + BUTTON_HEADER_CTX(BCONTEXT_RENDER, ICON_SCENE, N_("Render")); BUTTON_HEADER_CTX(BCONTEXT_SCENE, ICON_SCENE_DATA, N_("Scene")); BUTTON_HEADER_CTX(BCONTEXT_WORLD, ICON_WORLD, N_("World")); BUTTON_HEADER_CTX(BCONTEXT_OBJECT, ICON_OBJECT_DATA, N_("Object")); diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c index 43de6126ffb..d22b3125987 100644 --- a/source/blender/editors/space_view3d/drawobject.c +++ b/source/blender/editors/space_view3d/drawobject.c @@ -2953,7 +2953,7 @@ static void draw_em_measure_stats(View3D *v3d, Object *ob, BMEditMesh *em, UnitS else \ BLI_snprintf(numstr, sizeof(numstr), conv_float, area); \ view3d_cached_text_draw_add(vmid, numstr, 0, txt_flag, col); \ - } + } (void)0 UI_GetThemeColor3ubv(TH_DRAWEXTRA_FACEAREA, col); -- cgit v1.2.3