From 34aa68f29935e2d5b92f339eb732385cd67535f9 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 6 Aug 2013 03:45:11 +0000 Subject: [PATCH] fix for using uninitialized boolean vars for mask select more/less --- source/blender/editors/mask/mask_select.c | 7 ++++++- source/blender/modifiers/intern/MOD_decimate.c | 2 ++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/source/blender/editors/mask/mask_select.c b/source/blender/editors/mask/mask_select.c index c524aeb06ee..90796e9eb93 100644 --- a/source/blender/editors/mask/mask_select.c +++ b/source/blender/editors/mask/mask_select.c @@ -809,8 +809,9 @@ static int mask_select_more_less(bContext *C, bool more) } for (spline = masklay->splines.first; spline; spline = spline->next) { + const bool cyclic = (spline->flag & MASK_SPLINE_CYCLIC) != 0; + bool start_sel, end_sel, prev_sel, cur_sel; int i; - bool start_sel, end_sel, prev_sel, cur_sel, cyclic = spline->flag & MASK_SPLINE_CYCLIC; /* reselect point if any handle is selected to make the result more predictable */ for (i = 0; i < spline->tot_point; i++) { @@ -826,6 +827,10 @@ static int mask_select_more_less(bContext *C, bool more) start_sel = !!MASKPOINT_ISSEL_KNOT(spline->points); end_sel = !!MASKPOINT_ISSEL_KNOT(&spline->points[spline->tot_point - 1]); } + else { + start_sel = false; + end_sel = false; + } for (i = 0; i < spline->tot_point; i++) { if (i == 0 && !cyclic) { diff --git a/source/blender/modifiers/intern/MOD_decimate.c b/source/blender/modifiers/intern/MOD_decimate.c index 6c75f1d4be9..9fdb40e71dc 100644 --- a/source/blender/modifiers/intern/MOD_decimate.c +++ b/source/blender/modifiers/intern/MOD_decimate.c @@ -127,6 +127,8 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob, } calc_face_normal = true; break; + default: + return dm; } if (dmd->face_count <= 3) {