From f9c7cbd989c7ef82e46a997e2a3940e6f9e73213 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 12 Jan 2015 11:42:20 +1100 Subject: [PATCH] revert part of 7a1dc20 These warnings are false positives & confuses intended logic to set dummy values. --- source/blender/editors/mask/mask_ops.c | 4 ++-- source/blender/editors/sculpt_paint/paint_vertex.c | 2 +- source/blender/editors/space_sequencer/sequencer_select.c | 2 +- source/blender/editors/transform/transform.c | 2 -- source/blender/editors/transform/transform_conversions.c | 2 +- source/blender/modifiers/intern/MOD_laplaciansmooth.c | 2 +- source/blender/modifiers/intern/MOD_screw.c | 6 +++--- source/blender/windowmanager/intern/wm_operators.c | 2 +- 8 files changed, 10 insertions(+), 12 deletions(-) diff --git a/source/blender/editors/mask/mask_ops.c b/source/blender/editors/mask/mask_ops.c index 6580b66c225..929c4f74b2f 100644 --- a/source/blender/editors/mask/mask_ops.c +++ b/source/blender/editors/mask/mask_ops.c @@ -516,7 +516,7 @@ static bool spline_under_mouse_get(const bContext *C, MaskLayer *mask_layer; int width, height; float pixel_co[2]; - float closest_dist_squared = FLT_MAX; + float closest_dist_squared; MaskLayer *closest_layer = NULL; MaskSpline *closest_spline = NULL; bool undistort = false; @@ -2209,7 +2209,7 @@ static int mask_duplicate_exec(bContext *C, wmOperator *UNUSED(op)) } if (end >= start) { int tot_point; - int tot_point_shape_start = 0; + int tot_point_shape_start; MaskSpline *new_spline = BKE_mask_spline_add(mask_layer); MaskSplinePoint *new_point; int b; diff --git a/source/blender/editors/sculpt_paint/paint_vertex.c b/source/blender/editors/sculpt_paint/paint_vertex.c index 71ce63a8f80..7324cebbf49 100644 --- a/source/blender/editors/sculpt_paint/paint_vertex.c +++ b/source/blender/editors/sculpt_paint/paint_vertex.c @@ -2272,7 +2272,7 @@ static void wpaint_stroke_update_step(bContext *C, struct PaintStroke *stroke, P float paintweight; int *indexar; float totw; - unsigned int index, totindex = 0; + unsigned int index, totindex; float alpha; float mval[2]; bool use_vert_sel; diff --git a/source/blender/editors/space_sequencer/sequencer_select.c b/source/blender/editors/space_sequencer/sequencer_select.c index 050b290a75f..6792bbe0577 100644 --- a/source/blender/editors/space_sequencer/sequencer_select.c +++ b/source/blender/editors/space_sequencer/sequencer_select.c @@ -350,7 +350,7 @@ static int sequencer_select_invoke(bContext *C, wmOperator *op, const wmEvent *e } else if (left_right != SEQ_SELECT_LR_NONE) { /* use different logic for this */ - float x = 0.0f; + float x; ED_sequencer_deselect_all(scene); switch (left_right) { diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c index db3ca0e5465..3aec3d5c975 100644 --- a/source/blender/editors/transform/transform.c +++ b/source/blender/editors/transform/transform.c @@ -5240,8 +5240,6 @@ static BMLoop *get_next_loop(BMVert *v, BMLoop *l, float tvec[3]; float dist; - zero_v3(tvec); - if (bm_loop_calc_opposite_co(l_tmp, tdir, tvec)) { dist = len_v3v3(l_tmp->v->co, tvec); } diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c index 15f9f8df572..8d6aae46567 100644 --- a/source/blender/editors/transform/transform_conversions.c +++ b/source/blender/editors/transform/transform_conversions.c @@ -1117,7 +1117,7 @@ static void createTransArmatureVerts(TransInfo *t) bool mirror = ((arm->flag & ARM_MIRROR_EDIT) != 0); int total_mirrored = 0, i; int oldtot; - BoneInitData *bid = NULL; + BoneInitData *bid; t->total = 0; for (ebo = edbo->first; ebo; ebo = ebo->next) { diff --git a/source/blender/modifiers/intern/MOD_laplaciansmooth.c b/source/blender/modifiers/intern/MOD_laplaciansmooth.c index 06a25056e49..6f33bfa73fc 100644 --- a/source/blender/modifiers/intern/MOD_laplaciansmooth.c +++ b/source/blender/modifiers/intern/MOD_laplaciansmooth.c @@ -457,7 +457,7 @@ static void validate_solution(LaplacianSystem *sys, short flag, float lambda, fl { int i; float lam; - float vini = 0.0f, vend; + float vini, vend; if (flag & MOD_LAPLACIANSMOOTH_PRESERVE_VOLUME) { vini = compute_volume(sys->vertexCos, sys->mfaces, sys->numFaces); diff --git a/source/blender/modifiers/intern/MOD_screw.c b/source/blender/modifiers/intern/MOD_screw.c index c5a51035a22..5900baaf537 100644 --- a/source/blender/modifiers/intern/MOD_screw.c +++ b/source/blender/modifiers/intern/MOD_screw.c @@ -174,7 +174,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob, MLoopUV **mloopuv_layers = BLI_array_alloca(mloopuv_layers, mloopuv_layers_tot); float uv_u_scale; float uv_v_minmax[2] = {FLT_MAX, -FLT_MAX}; - float uv_v_range_inv = 0.0f; + float uv_v_range_inv; float uv_axis_plane[4]; char axis_char = 'X'; @@ -194,7 +194,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob, unsigned int edge_offset; - MPoly *mpoly_orig = NULL, *mpoly_new, *mp_new; + MPoly *mpoly_orig, *mpoly_new, *mp_new; MLoop *mloop_orig, *mloop_new, *ml_new; MEdge *medge_orig, *med_orig, *med_new, *med_new_firstloop, *medge_new; MVert *mvert_new, *mvert_orig, *mv_orig, *mv_new, *mv_new_base; @@ -875,7 +875,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob, const unsigned int step_last = step_tot - (close ? 1 : 2); const unsigned int mpoly_index_orig = totpoly ? edge_poly_map[i] : UINT_MAX; const bool has_mpoly_orig = (mpoly_index_orig != UINT_MAX); - float uv_v_offset_a = 0.0f, uv_v_offset_b = 0.0f; + float uv_v_offset_a, uv_v_offset_b; const unsigned int mloop_index_orig[2] = { vert_loop_map ? vert_loop_map[medge_new[i].v1] : UINT_MAX, diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c index 3150c030659..5b944a7b1ec 100644 --- a/source/blender/windowmanager/intern/wm_operators.c +++ b/source/blender/windowmanager/intern/wm_operators.c @@ -4304,7 +4304,7 @@ static void radial_control_cancel(bContext *C, wmOperator *op) static int radial_control_modal(bContext *C, wmOperator *op, const wmEvent *event) { RadialControl *rc = op->customdata; - float new_value, dist = 0.0f, zoom[2]; + float new_value, dist, zoom[2]; float delta[2], ret = OPERATOR_RUNNING_MODAL; bool snap; float angle_precision = 0.0f;