[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46779] branches/soc-2011-tomato/source/ blender: code cleanup: use for loops for mask/spline looping

Campbell Barton ideasman42 at gmail.com
Fri May 18 16:49:30 CEST 2012


Revision: 46779
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46779
Author:   campbellbarton
Date:     2012-05-18 14:49:30 +0000 (Fri, 18 May 2012)
Log Message:
-----------
code cleanup: use for loops for mask/spline looping

Modified Paths:
--------------
    branches/soc-2011-tomato/source/blender/blenkernel/intern/mask.c
    branches/soc-2011-tomato/source/blender/blenloader/intern/readfile.c
    branches/soc-2011-tomato/source/blender/blenloader/intern/writefile.c
    branches/soc-2011-tomato/source/blender/editors/mask/mask_draw.c
    branches/soc-2011-tomato/source/blender/editors/mask/mask_ops.c
    branches/soc-2011-tomato/source/blender/editors/transform/transform_conversions.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_mask.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_mask.c

Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/mask.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/mask.c	2012-05-18 14:08:54 UTC (rev 46778)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/mask.c	2012-05-18 14:49:30 UTC (rev 46779)
@@ -957,13 +957,13 @@
 
 void BKE_mask_evaluate(Mask *mask, float ctime)
 {
-	MaskObject *maskobj = mask->maskobjs.first;
+	MaskObject *maskobj;
 
-	while (maskobj) {
-		MaskSpline *spline = maskobj->splines.first;
+	for (maskobj = mask->maskobjs.first; maskobj; maskobj = maskobj->next) {
+		MaskSpline *spline;
 		int i;
 
-		while (spline) {
+		for (spline = maskobj->splines.first; spline; spline = spline->next) {
 			for (i = 0; i < spline->tot_point; i++) {
 				MaskSplinePoint *point = &spline->points[i];
 				BezTriple *bezt = &point->bezt;
@@ -977,11 +977,7 @@
 				add_v2_v2(bezt->vec[1], delta);
 				add_v2_v2(bezt->vec[2], delta);
 			}
-
-			spline = spline->next;
 		}
-
-		maskobj = maskobj->next;
 	}
 
 	BKE_mask_calc_handles(mask);

Modified: branches/soc-2011-tomato/source/blender/blenloader/intern/readfile.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenloader/intern/readfile.c	2012-05-18 14:08:54 UTC (rev 46778)
+++ branches/soc-2011-tomato/source/blender/blenloader/intern/readfile.c	2012-05-18 14:49:30 UTC (rev 46779)
@@ -6282,8 +6282,7 @@
 
 	link_list(fd, &mask->maskobjs);
 
-	maskobj = mask->maskobjs.first;
-	while (maskobj) {
+	for (maskobj = mask->maskobjs.first; maskobj; maskobj = maskobj->next) {
 		MaskSpline *spline;
 
 		link_list(fd, &maskobj->splines);
@@ -6306,8 +6305,6 @@
 
 		maskobj->act_spline = newdataadr(fd, maskobj->act_spline);
 		maskobj->act_point = newdataadr(fd, maskobj->act_point);
-
-		maskobj = maskobj->next;
 	}
 }
 
@@ -6328,8 +6325,7 @@
 			if (mask->adt)
 				lib_link_animdata(fd, &mask->id, mask->adt);
 
-			maskobj = mask->maskobjs.first;
-			while (maskobj) {
+			for (maskobj = mask->maskobjs.first; maskobj; maskobj = maskobj->next) {
 				MaskSpline *spline;
 
 				spline = maskobj->splines.first;
@@ -6346,8 +6342,6 @@
 
 					spline = spline->next;
 				}
-
-				maskobj = maskobj->next;
 			}
 
 			mask->id.flag -= LIB_NEEDLINK;

Modified: branches/soc-2011-tomato/source/blender/blenloader/intern/writefile.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenloader/intern/writefile.c	2012-05-18 14:08:54 UTC (rev 46778)
+++ branches/soc-2011-tomato/source/blender/blenloader/intern/writefile.c	2012-05-18 14:49:30 UTC (rev 46779)
@@ -2769,14 +2769,12 @@
 			if (mask->adt)
 				write_animdata(wd, mask->adt);
 
-			maskobj = mask->maskobjs.first;
-			while (maskobj) {
+			for (maskobj = mask->maskobjs.first; maskobj; maskobj = maskobj->next) {
 				MaskSpline *spline;
 
 				writestruct(wd, DATA, "MaskObject", 1, maskobj);
 
-				spline = maskobj->splines.first;
-				while (spline) {
+				for (spline = maskobj->splines.first; spline; spline = spline->next) {
 					int i;
 
 					writestruct(wd, DATA, "MaskSpline", 1, spline);
@@ -2788,11 +2786,7 @@
 						if (point->tot_uw)
 							writestruct(wd, DATA, "MaskSplinePointUW", point->tot_uw, point->uw);
 					}
-
-					spline = spline->next;
 				}
-
-				maskobj = maskobj->next;
 			}
 		}
 

Modified: branches/soc-2011-tomato/source/blender/editors/mask/mask_draw.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/mask/mask_draw.c	2012-05-18 14:08:54 UTC (rev 46778)
+++ branches/soc-2011-tomato/source/blender/editors/mask/mask_draw.c	2012-05-18 14:49:30 UTC (rev 46779)
@@ -218,22 +218,18 @@
 
 static void draw_maskobjs(Mask *mask)
 {
-	MaskObject *maskobj = mask->maskobjs.first;
+	MaskObject *maskobj;
 
-	while (maskobj) {
-		MaskSpline *spline = maskobj->splines.first;
+	for (maskobj = mask->maskobjs.first; maskobj; maskobj = maskobj->next) {
+		MaskSpline *spline;
 
-		while (spline) {
+		for (spline = maskobj->splines.first; spline; spline = spline->next) {
 			/* draw curve itself first... */
 			draw_spline_curve(maskobj, spline);
 
 			/* ...and then handles over the curve so they're nicely visible */
 			draw_spline_points(maskobj, spline);
-
-			spline = spline->next;
 		}
-
-		maskobj = maskobj->next;
 	}
 }
 

Modified: branches/soc-2011-tomato/source/blender/editors/mask/mask_ops.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/mask/mask_ops.c	2012-05-18 14:08:54 UTC (rev 46778)
+++ branches/soc-2011-tomato/source/blender/editors/mask/mask_ops.c	2012-05-18 14:49:30 UTC (rev 46779)
@@ -167,19 +167,16 @@
 
 static int mask_has_selection(Mask *mask)
 {
-	MaskObject *maskobj = mask->maskobjs.first;
+	MaskObject *maskobj;
 
-	while (maskobj) {
-		MaskSpline *spline = maskobj->splines.first;
+	for (maskobj = mask->maskobjs.first; maskobj; maskobj = maskobj->next) {
+		MaskSpline *spline;
 
-		while (spline) {
-			if (points_has_selection(spline->points, spline->tot_point))
+		for (spline = maskobj->splines.first; spline; spline = spline->next) {
+			if (points_has_selection(spline->points, spline->tot_point)) {
 				return TRUE;
-
-			spline = spline->next;
+			}
 		}
-
-		maskobj = maskobj->next;
 	}
 
 	return FALSE;
@@ -187,7 +184,7 @@
 
 static void toggle_selection_all(Mask *mask, int action)
 {
-	MaskObject *maskobj = mask->maskobjs.first;
+	MaskObject *maskobj;
 
 	if (action == SEL_TOGGLE) {
 		if (mask_has_selection(mask))
@@ -196,10 +193,10 @@
 			action = SEL_SELECT;
 	}
 
-	while (maskobj) {
-		MaskSpline *spline = maskobj->splines.first;
+	for (maskobj = mask->maskobjs.first; maskobj; maskobj = maskobj->next) {
+		MaskSpline *spline;
 
-		while (spline) {
+		for (spline = maskobj->splines.first; spline; spline = spline->next) {
 			int i;
 
 			for (i = 0; i < spline->tot_point; i++) {
@@ -207,11 +204,7 @@
 
 				spline_point_select(point, action);
 			}
-
-			spline = spline->next;
 		}
-
-		maskobj = maskobj->next;
 	}
 }
 
@@ -234,11 +227,10 @@
 	co[0] = normal_co[0] * scalex;
 	co[1] = normal_co[1] * scaley;
 
-	maskobj = mask->maskobjs.first;
-	while (maskobj) {
-		MaskSpline *spline = maskobj->splines.first;
+	for (maskobj = mask->maskobjs.first; maskobj; maskobj = maskobj->next) {
+		MaskSpline *spline;
 
-		while (spline) {
+		for (spline = maskobj->splines.first; spline; spline = spline->next) {
 			int i;
 
 			for (i = 0; i < spline->tot_point; i++) {
@@ -274,11 +266,7 @@
 					is_handle = FALSE;
 				}
 			}
-
-			spline = spline->next;
 		}
-
-		maskobj = maskobj->next;
 	}
 
 	if (len < threshold) {
@@ -328,11 +316,10 @@
 	co[0] = normal_co[0] * scalex;
 	co[1] = normal_co[1] * scaley;
 
-	maskobj = mask->maskobjs.first;
-	while (maskobj) {
-		MaskSpline *spline = maskobj->splines.first;
+	for (maskobj = mask->maskobjs.first; maskobj; maskobj = maskobj->next) {
+		MaskSpline *spline;
 
-		while (spline) {
+		for (spline = maskobj->splines.first; spline; spline = spline->next) {
 			int i, tot_feather_point;
 			float *feather_points, *fp;
 
@@ -367,11 +354,7 @@
 			}
 
 			MEM_freeN(feather_points);
-
-			spline = spline->next;
 		}
-
-		maskobj = maskobj->next;
 	}
 
 	if (len < threshold) {
@@ -424,11 +407,10 @@
 	co[0] = normal_co[0] * scalex;
 	co[1] = normal_co[1] * scaley;
 
-	maskobj = mask->maskobjs.first;
-	while (maskobj) {
-		MaskSpline *spline = maskobj->splines.first;
+	for (maskobj = mask->maskobjs.first; maskobj; maskobj = maskobj->next) {
+		MaskSpline *spline;
 
-		while (spline) {
+		for (spline = maskobj->splines.first; spline; spline = spline->next) {
 			int i;
 
 			for (i = 0; i < spline->tot_point; i++) {
@@ -484,11 +466,7 @@
 					MEM_freeN(diff_points);
 				}
 			}
-
-			spline = spline->next;
 		}
-
-		maskobj = maskobj->next;
 	}
 
 	if (point && dist < threshold) {
@@ -526,11 +504,10 @@
 {
 	MaskObject *maskobj;
 
-	maskobj = mask->maskobjs.first;
-	while (maskobj) {
-		MaskSpline *spline = maskobj->splines.first;
+	for (maskobj = mask->maskobjs.first; maskobj; maskobj = maskobj->next) {
+		MaskSpline *spline;
 
-		while (spline) {
+		for (spline = maskobj->splines.first; spline; spline = spline->next) {
 			int i;
 
 			spline->flag &= ~SELECT;
@@ -552,11 +529,7 @@
 					}
 				}
 			}
-
-			spline = spline->next;
 		}
-
-		maskobj = maskobj->next;
 	}
 }
 
@@ -1477,19 +1450,16 @@
 static int cyclic_toggle_exec(bContext *C, wmOperator *UNUSED(op))
 {
 	Mask *mask = CTX_data_edit_mask(C);
-	MaskObject *maskobj = mask->maskobjs.first;
+	MaskObject *maskobj;
 
-	while (maskobj) {
-		MaskSpline *spline = maskobj->splines.first;
+	for (maskobj = mask->maskobjs.first; maskobj; maskobj = maskobj->next) {
+		MaskSpline *spline;
 
-		while (spline) {
-			if (points_has_selection(spline->points, spline->tot_point))
+		for (spline = maskobj->splines.first; spline; spline = spline->next) {
+			if (points_has_selection(spline->points, spline->tot_point)) {
 				spline->flag ^= MASK_SPLINE_CYCLIC;
-
-			spline = spline->next;
+			}
 		}
-
-		maskobj = maskobj->next;
 	}
 
 	WM_event_add_notifier(C, NC_MASK | NA_EDITED, mask);
@@ -1553,9 +1523,9 @@
 static int delete_exec(bContext *C, wmOperator *UNUSED(op))
 {
 	Mask *mask = CTX_data_edit_mask(C);
-	MaskObject *maskobj = mask->maskobjs.first;
+	MaskObject *maskobj;
 
-	while (maskobj) {
+	for (maskobj = mask->maskobjs.first; maskobj; maskobj = maskobj->next) {
 		MaskSpline *spline = maskobj->splines.first;
 
 		while (spline) {
@@ -1615,8 +1585,6 @@
 
 			spline = next_spline;
 		}
-
-		maskobj = maskobj->next;
 	}
 
 	WM_event_add_notifier(C, NC_MASK | NA_EDITED, mask);
@@ -1645,14 +1613,14 @@
 static int set_handle_type_exec(bContext *C, wmOperator *op)
 {
 	Mask *mask = CTX_data_edit_mask(C);
-	MaskObject *maskobj = mask->maskobjs.first;
+	MaskObject *maskobj;
 	int handle_type = RNA_enum_get(op->ptr, "type");
 
-	while (maskobj) {
-		MaskSpline *spline = maskobj->splines.first;
+	for (maskobj = mask->maskobjs.first; maskobj; maskobj = maskobj->next) {
+		MaskSpline *spline;
 		int i;
 
-		while (spline) {
+		for (spline = maskobj->splines.first; spline; spline = spline->next) {
 			for (i = 0; i < spline->tot_point; i++) {
 				MaskSplinePoint *point = &spline->points[i];
 
@@ -1662,11 +1630,7 @@
 					bezt->h1 = bezt->h2 = handle_type;
 				}
 			}
-
-			spline = spline->next;
 		}
-
-		maskobj = maskobj->next;
 	}
 
 	WM_event_add_notifier(C, NC_MASK | ND_DATA, mask);


@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list