[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47206] branches/soc-2011-tomato/source/ blender/editors/transform/transform_conversions.c: transform wasnt ignoring hidden maskobjects

Campbell Barton ideasman42 at gmail.com
Wed May 30 08:42:04 CEST 2012


Revision: 47206
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47206
Author:   campbellbarton
Date:     2012-05-30 06:42:03 +0000 (Wed, 30 May 2012)
Log Message:
-----------
transform wasnt ignoring hidden maskobjects

Modified Paths:
--------------
    branches/soc-2011-tomato/source/blender/editors/transform/transform_conversions.c

Modified: branches/soc-2011-tomato/source/blender/editors/transform/transform_conversions.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/transform/transform_conversions.c	2012-05-30 06:37:40 UTC (rev 47205)
+++ branches/soc-2011-tomato/source/blender/editors/transform/transform_conversions.c	2012-05-30 06:42:03 UTC (rev 47206)
@@ -5975,7 +5975,11 @@
 	for (maskobj = mask->maskobjs.first; maskobj; maskobj = maskobj->next) {
 		MaskSpline *spline = maskobj->splines.first;
 
-		while (spline) {
+		if (maskobj->restrictflag & MASK_RESTRICT_VIEW) {
+			continue;
+		}
+
+		for (spline = maskobj->splines.first; spline; spline = spline->next) {
 			int i;
 
 			for (i = 0; i < spline->tot_point; i++) {
@@ -5988,8 +5992,6 @@
 						t->total += 1;
 				}
 			}
-
-			spline = spline->next;
 		}
 	}
 
@@ -6008,7 +6010,11 @@
 	for (maskobj = mask->maskobjs.first; maskobj; maskobj = maskobj->next) {
 		MaskSpline *spline = maskobj->splines.first;
 
-		while (spline) {
+		if (maskobj->restrictflag & MASK_RESTRICT_VIEW) {
+			continue;
+		}
+
+		for (spline = maskobj->splines.first; spline; spline = spline->next) {
 			int i;
 
 			for (i = 0; i < spline->tot_point; i++) {
@@ -6029,8 +6035,6 @@
 					}
 				}
 			}
-
-			spline = spline->next;
 		}
 	}
 }




More information about the Bf-blender-cvs mailing list