[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48925] trunk/blender/source/blender/ blenkernel/intern/mask_rasterize.c: code cleanup

Campbell Barton ideasman42 at gmail.com
Sat Jul 14 21:21:13 CEST 2012


Revision: 48925
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48925
Author:   campbellbarton
Date:     2012-07-14 19:21:13 +0000 (Sat, 14 Jul 2012)
Log Message:
-----------
code cleanup

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/mask_rasterize.c

Modified: trunk/blender/source/blender/blenkernel/intern/mask_rasterize.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/mask_rasterize.c	2012-07-14 18:57:16 UTC (rev 48924)
+++ trunk/blender/source/blender/blenkernel/intern/mask_rasterize.c	2012-07-14 19:21:13 UTC (rev 48925)
@@ -461,6 +461,7 @@
 		BLI_scanfill_begin(&sf_ctx);
 
 		for (spline = masklay->splines.first; spline; spline = spline->next) {
+			// const unsigned int is_cyclic = (spline->flag & MASK_SPLINE_CYCLIC) != 0;
 
 			float (*diff_points)[2];
 			int tot_diff_point;
@@ -471,7 +472,6 @@
 			diff_points = BKE_mask_spline_differentiate_with_resolution_ex(
 			                  spline, resol, &tot_diff_point);
 
-			/* dont ch*/
 			if (do_feather) {
 				diff_feather_points = BKE_mask_spline_feather_differentiated_points_with_resolution_ex(
 				                          spline, resol, &tot_diff_feather_points);
@@ -567,7 +567,7 @@
 
 					BLI_assert(tot_diff_feather_points == tot_diff_point);
 
-					/* note: only added for convenience, we dont infact use these to scanfill,
+					/* note: only added for convenience, we don't infact use these to scanfill,
 					 * only to create feather faces after scanfill */
 					for (j = 0; j < tot_diff_feather_points; j++) {
 						copy_v2_v2(co_feather, diff_feather_points[j]);
@@ -816,41 +816,37 @@
 	unsigned int i;
 	MaskRasterLayer *layer = mr_handle->layers;
 
-	/* raycast vars*/
-
-	/* return */
+	/* return value */
 	float value = 0.0f;
 
 	for (i = 0; i < layers_tot; i++, layer++) {
-		float dist_ease;
-		float v;
+		float value_layer;
 
 		if (BLI_in_rctf_v(&layer->bounds, xy)) {
-			/* --- hit (start) --- */
 			const float dist = 1.0f - layer_bucket_depth_from_xy(layer, xy);
-			dist_ease = (3.0f * dist * dist - 2.0f * dist * dist * dist);
+			const float dist_ease = (3.0f * dist * dist - 2.0f * dist * dist * dist);
+
+			/* apply alpha */
+			value_layer = dist_ease * layer->alpha;
 		}
 		else {
-			dist_ease = 0.0f;
+			value_layer = 0.0f;
 		}
 
-		/* apply alpha */
-		v = dist_ease * layer->alpha;
-
 		if (layer->blend_flag & MASK_BLENDFLAG_INVERT) {
-			v = 1.0f - v;
+			value_layer = 1.0f - value_layer;
 		}
 
 		switch (layer->blend) {
 			case MASK_BLEND_SUBTRACT:
 			{
-				value -= v;
+				value -= value_layer;
 				break;
 			}
 			case MASK_BLEND_ADD:
 			default:
 			{
-				value += v;
+				value += value_layer;
 				break;
 			}
 		}




More information about the Bf-blender-cvs mailing list