From 6470056a0d1ed1a07c823d46ea292d69d3c2a8fb Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 2 Apr 2019 17:54:04 +1100 Subject: Cleanup: empty expression statement warning --- .../editors/gizmo_library/gizmo_types/cage2d_gizmo.c | 2 +- source/blender/editors/gpencil/gpencil_paint.c | 4 ++-- source/blender/editors/gpencil/gpencil_primitive.c | 2 +- source/blender/editors/include/ED_anim_api.h | 4 ++-- source/blender/editors/interface/interface_icons.c | 4 ++-- source/blender/editors/mesh/editmesh_utils.c | 2 +- source/blender/editors/object/object_add.c | 2 +- source/blender/editors/object/object_collection.c | 2 +- source/blender/editors/space_outliner/outliner_edit.c | 2 +- source/blender/editors/transform/transform_snap_object.c | 2 +- source/blender/editors/uvedit/uvedit_ops.c | 14 +++++++------- 11 files changed, 20 insertions(+), 20 deletions(-) (limited to 'source/blender/editors') diff --git a/source/blender/editors/gizmo_library/gizmo_types/cage2d_gizmo.c b/source/blender/editors/gizmo_library/gizmo_types/cage2d_gizmo.c index f4f4c6425c2..45b7b37eb8d 100644 --- a/source/blender/editors/gizmo_library/gizmo_types/cage2d_gizmo.c +++ b/source/blender/editors/gizmo_library/gizmo_types/cage2d_gizmo.c @@ -759,7 +759,7 @@ static int gizmo_cage2d_test_select( r.ymin = -size[1] + margin[1]; r.xmax = size[0] - margin[0]; r.ymax = size[1] - margin[1]; - }; + } bool isect = BLI_rctf_isect_pt_v(&r, point_local); if (isect) { return ED_GIZMO_CAGE2D_PART_TRANSLATE; diff --git a/source/blender/editors/gpencil/gpencil_paint.c b/source/blender/editors/gpencil/gpencil_paint.c index cb58542dc38..df40422e1c1 100644 --- a/source/blender/editors/gpencil/gpencil_paint.c +++ b/source/blender/editors/gpencil/gpencil_paint.c @@ -509,11 +509,11 @@ static void gp_brush_jitter( static void gp_brush_angle(bGPdata *gpd, Brush *brush, tGPspoint *pt, const float mval[2]) { float mvec[2]; - float sen = brush->gpencil_settings->draw_angle_factor; /* sensitivity */; + float sen = brush->gpencil_settings->draw_angle_factor; /* sensitivity */ float fac; float mpressure; - /* default angle of brush in radians */; + /* default angle of brush in radians */ float angle = brush->gpencil_settings->draw_angle; /* angle vector of the brush with full thickness */ float v0[2] = { cos(angle), sin(angle) }; diff --git a/source/blender/editors/gpencil/gpencil_primitive.c b/source/blender/editors/gpencil/gpencil_primitive.c index bde6bd30b76..f6571773706 100644 --- a/source/blender/editors/gpencil/gpencil_primitive.c +++ b/source/blender/editors/gpencil/gpencil_primitive.c @@ -834,7 +834,7 @@ static void gp_primitive_update_strokes(bContext *C, tGPDprimitive *tgpi) const float fac = p2d->rnd[0] * exfactor * jitter; /* vector */ - float mvec[2], svec[2];; + float mvec[2], svec[2]; if (i > 0) { mvec[0] = (p2d->x - (p2d - 1)->x); mvec[1] = (p2d->y - (p2d - 1)->y); diff --git a/source/blender/editors/include/ED_anim_api.h b/source/blender/editors/include/ED_anim_api.h index 99b634ddfcc..6dccc55d3ff 100644 --- a/source/blender/editors/include/ED_anim_api.h +++ b/source/blender/editors/include/ED_anim_api.h @@ -735,7 +735,7 @@ float ANIM_unit_mapping_get_factor(struct Scene *scene, struct ID *id, struct FC if (smode == ACHANNEL_SETFLAG_INVERT) (channel)->flag ^= (sflag); \ else if (smode == ACHANNEL_SETFLAG_ADD) (channel)->flag |= (sflag); \ else (channel)->flag &= ~(sflag); \ - } + } ((void)0) /* set/clear/toggle macro, where the flag is negative * - channel - channel with a 'flag' member that we're setting @@ -747,7 +747,7 @@ float ANIM_unit_mapping_get_factor(struct Scene *scene, struct ID *id, struct FC if (smode == ACHANNEL_SETFLAG_INVERT) (channel)->flag ^= (sflag); \ else if (smode == ACHANNEL_SETFLAG_ADD) (channel)->flag &= ~(sflag); \ else (channel)->flag |= (sflag); \ - } + } ((void)0) /* --------- anim_deps.c, animation updates -------- */ diff --git a/source/blender/editors/interface/interface_icons.c b/source/blender/editors/interface/interface_icons.c index 96086b21ab2..dcfeaf64699 100644 --- a/source/blender/editors/interface/interface_icons.c +++ b/source/blender/editors/interface/interface_icons.c @@ -476,7 +476,7 @@ static void init_brush_icons(void) di = def_internal_icon(NULL, icon_id, 0, 0, w, ICON_TYPE_BUFFER, 0); \ di->data.buffer.image->datatoc_rect = rect; \ di->data.buffer.image->datatoc_size = size; \ - } + } ((void)0) /* end INIT_BRUSH_ICON */ const int w = 96; /* warning, brush size hardcoded in C, but it gets scaled */ @@ -614,7 +614,7 @@ static void init_event_icons(void) di->data.input.icon = icon_id; \ di->data.input.next = di_next; \ di_next = di; \ - } + } ((void)0) /* end INIT_EVENT_ICON */ const int w = 16; /* DUMMY */ diff --git a/source/blender/editors/mesh/editmesh_utils.c b/source/blender/editors/mesh/editmesh_utils.c index 68a2f382278..3a4f9d461ec 100644 --- a/source/blender/editors/mesh/editmesh_utils.c +++ b/source/blender/editors/mesh/editmesh_utils.c @@ -1039,7 +1039,7 @@ void EDBM_verts_mirror_cache_begin_ex( BLI_kdtree_3d_balance(tree); } -#define VERT_INTPTR(_v, _i) r_index ? &r_index[_i] : BM_ELEM_CD_GET_VOID_P(_v, cd_vmirr_offset); +#define VERT_INTPTR(_v, _i) (r_index ? &r_index[_i] : BM_ELEM_CD_GET_VOID_P(_v, cd_vmirr_offset)) BM_ITER_MESH_INDEX (v, &iter, bm, BM_VERTS_OF_MESH, i) { BLI_assert(BM_elem_index_get(v) == i); diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c index 42c5c2b3576..9269c25f54b 100644 --- a/source/blender/editors/object/object_add.c +++ b/source/blender/editors/object/object_add.c @@ -2215,7 +2215,7 @@ static Base *object_add_duplicate_internal(Main *bmain, Scene *scene, ViewLayer Object *obn; if (ob->mode & OB_MODE_POSE) { - ; /* nothing? */ + /* nothing? */ } else { obn = ID_NEW_SET(ob, BKE_object_duplicate(bmain, ob, dupflag)); diff --git a/source/blender/editors/object/object_collection.c b/source/blender/editors/object/object_collection.c index c226ad7a47f..e8552c823bf 100644 --- a/source/blender/editors/object/object_collection.c +++ b/source/blender/editors/object/object_collection.c @@ -320,7 +320,7 @@ static int collection_objects_remove_exec(bContext *C, wmOperator *op) } CTX_DATA_END; } - FOREACH_COLLECTION_END + FOREACH_COLLECTION_END; if (!updated) return OPERATOR_CANCELLED; diff --git a/source/blender/editors/space_outliner/outliner_edit.c b/source/blender/editors/space_outliner/outliner_edit.c index aa9c462d74e..8b8dff9dc27 100644 --- a/source/blender/editors/space_outliner/outliner_edit.c +++ b/source/blender/editors/space_outliner/outliner_edit.c @@ -254,7 +254,7 @@ static void do_item_rename(ARegion *ar, TreeElement *te, TreeStoreElem *tselem, /* can't rename rna datablocks entries or listbases */ if (ELEM(tselem->type, TSE_RNA_STRUCT, TSE_RNA_PROPERTY, TSE_RNA_ARRAY_ELEM, TSE_ID_BASE, TSE_SCENE_OBJECTS_BASE)) { - /* do nothing */; + /* do nothing */ } else if (ELEM(tselem->type, TSE_ANIM_DATA, TSE_NLA, TSE_DEFGROUP_BASE, TSE_CONSTRAINT_BASE, TSE_MODIFIER_BASE, TSE_DRIVER_BASE, TSE_POSE_BASE, TSE_POSEGRP_BASE, TSE_R_LAYER_BASE, TSE_SCENE_COLLECTION_BASE, diff --git a/source/blender/editors/transform/transform_snap_object.c b/source/blender/editors/transform/transform_snap_object.c index 62ecfdbc59d..ea3657b8729 100644 --- a/source/blender/editors/transform/transform_snap_object.c +++ b/source/blender/editors/transform/transform_snap_object.c @@ -1327,7 +1327,7 @@ static short snap_mesh_edge_verts_mixed( neasrest_precalc.ray_direction, v_pair[0], v_pair[1], &lambda)) { - /* do nothing */; + /* do nothing */ } else if (lambda < 0.25f || 0.75f < lambda) { int v_id = lambda < 0.5f ? 0 : 1; diff --git a/source/blender/editors/uvedit/uvedit_ops.c b/source/blender/editors/uvedit/uvedit_ops.c index b8c2c461f9b..a4247ec370d 100644 --- a/source/blender/editors/uvedit/uvedit_ops.c +++ b/source/blender/editors/uvedit/uvedit_ops.c @@ -2627,7 +2627,7 @@ static void UV_OT_select(wmOperatorType *ot) /* api callbacks */ ot->exec = uv_select_exec; ot->invoke = uv_select_invoke; - ot->poll = ED_operator_uvedit; /* requires space image */; + ot->poll = ED_operator_uvedit; /* requires space image */ /* properties */ RNA_def_boolean(ot->srna, "extend", 0, @@ -2676,7 +2676,7 @@ static void UV_OT_select_loop(wmOperatorType *ot) /* api callbacks */ ot->exec = uv_select_loop_exec; ot->invoke = uv_select_loop_invoke; - ot->poll = ED_operator_uvedit; /* requires space image */; + ot->poll = ED_operator_uvedit; /* requires space image */ /* properties */ RNA_def_boolean(ot->srna, "extend", 0, @@ -2811,7 +2811,7 @@ static void UV_OT_select_linked_pick(wmOperatorType *ot) /* api callbacks */ ot->invoke = uv_select_linked_pick_invoke; ot->exec = uv_select_linked_pick_exec; - ot->poll = ED_operator_uvedit; /* requires space image */; + ot->poll = ED_operator_uvedit; /* requires space image */ /* properties */ RNA_def_boolean(ot->srna, "extend", 0, @@ -2917,7 +2917,7 @@ static void UV_OT_select_split(wmOperatorType *ot) /* api callbacks */ ot->exec = uv_select_split_exec; - ot->poll = ED_operator_uvedit; /* requires space image */; + ot->poll = ED_operator_uvedit; /* requires space image */ } static void uv_select_sync_flush(ToolSettings *ts, BMEditMesh *em, const short select) @@ -3312,7 +3312,7 @@ static void UV_OT_select_box(wmOperatorType *ot) ot->invoke = WM_gesture_box_invoke; ot->exec = uv_box_select_exec; ot->modal = WM_gesture_box_modal; - ot->poll = ED_operator_uvedit_space_image; /* requires space image */; + ot->poll = ED_operator_uvedit_space_image; /* requires space image */ ot->cancel = WM_gesture_box_cancel; /* flags */ @@ -3460,7 +3460,7 @@ static void UV_OT_select_circle(wmOperatorType *ot) ot->invoke = WM_gesture_circle_invoke; ot->modal = WM_gesture_circle_modal; ot->exec = uv_circle_select_exec; - ot->poll = ED_operator_uvedit_space_image; /* requires space image */; + ot->poll = ED_operator_uvedit_space_image; /* requires space image */ ot->cancel = WM_gesture_circle_cancel; /* flags */ @@ -3697,7 +3697,7 @@ static void UV_OT_snap_cursor(wmOperatorType *ot) /* api callbacks */ ot->exec = uv_snap_cursor_exec; - ot->poll = ED_operator_uvedit_space_image; /* requires space image */; + ot->poll = ED_operator_uvedit_space_image; /* requires space image */ /* properties */ RNA_def_enum(ot->srna, "target", target_items, 0, "Target", "Target to snap the selected UVs to"); -- cgit v1.2.3