sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

fix for using uninitialized boolean vars for mask select more/less

Browse Source
This commit is contained in:
Campbell Barton 2013-08-06 03:45:11 +00:00
parent 0398ef6ae0
commit 34aa68f299
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source/blender/editors/mask/mask_select.c
View File

@ -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) {

2
source/blender/modifiers/intern/MOD_decimate.c
View File

@ -127,6 +127,8 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob,
}
calc_face_normal = true;
break;
default:
return dm;
}
if (dmd->face_count <= 3) {