[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58954] trunk/blender/source/blender: fix for using uninitialized boolean vars for mask select more/less

Campbell Barton ideasman42 at gmail.com
Tue Aug 6 05:45:12 CEST 2013


Revision: 58954
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58954
Author:   campbellbarton
Date:     2013-08-06 03:45:11 +0000 (Tue, 06 Aug 2013)
Log Message:
-----------
fix for using uninitialized boolean vars for mask select more/less

Modified Paths:
--------------
    trunk/blender/source/blender/editors/mask/mask_select.c
    trunk/blender/source/blender/modifiers/intern/MOD_decimate.c

Modified: trunk/blender/source/blender/editors/mask/mask_select.c
===================================================================
--- trunk/blender/source/blender/editors/mask/mask_select.c	2013-08-06 02:47:47 UTC (rev 58953)
+++ trunk/blender/source/blender/editors/mask/mask_select.c	2013-08-06 03:45:11 UTC (rev 58954)
@@ -809,8 +809,9 @@
 		}
 
 		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 @@
 				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) {

Modified: trunk/blender/source/blender/modifiers/intern/MOD_decimate.c
===================================================================
--- trunk/blender/source/blender/modifiers/intern/MOD_decimate.c	2013-08-06 02:47:47 UTC (rev 58953)
+++ trunk/blender/source/blender/modifiers/intern/MOD_decimate.c	2013-08-06 03:45:11 UTC (rev 58954)
@@ -127,6 +127,8 @@
 			}
 			calc_face_normal = true;
 			break;
+		default:
+			return dm;
 	}
 
 	if (dmd->face_count <= 3) {




More information about the Bf-blender-cvs mailing list