[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49032] trunk/blender/source/blender: add difference blending mode, also fix error in last commit

[Campbell Barton]

Revision: 49032
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49032
Author:   campbellbarton
Date:     2012-07-18 13:44:48 +0000 (Wed, 18 Jul 2012)
Log Message:
-----------
add difference blending mode, also fix error in last commit

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/mask_rasterize.c
    trunk/blender/source/blender/makesdna/DNA_mask_types.h
    trunk/blender/source/blender/makesrna/intern/rna_mask.c

Modified: trunk/blender/source/blender/blenkernel/intern/mask_rasterize.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/mask_rasterize.c	2012-07-18 13:34:14 UTC (rev 49031)
+++ trunk/blender/source/blender/blenkernel/intern/mask_rasterize.c	2012-07-18 13:44:48 UTC (rev 49032)
@@ -1235,6 +1235,9 @@
 			case MASK_BLEND_REPLACE:
 				value = (value * (1.0f - layer->alpha)) + (value_layer * layer->alpha);
 				break;
+			case MASK_BLEND_DIFFERENCE:
+				value = fabsf(value - value_layer);
+				break;
 			default: /* same as add */
 				BLI_assert(0);
 				value += value_layer;
@@ -1243,7 +1246,7 @@
 
 		/* clamp after applying each layer so we don't get
 		 * issues subtracting after accumulating over 1.0f */
-		return CLAMPIS(value, 0.0f, 1.0f);
+		CLAMP(value, 0.0f, 1.0f);
 	}
 
 	return value;

Modified: trunk/blender/source/blender/makesdna/DNA_mask_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_mask_types.h	2012-07-18 13:34:14 UTC (rev 49031)
+++ trunk/blender/source/blender/makesdna/DNA_mask_types.h	2012-07-18 13:44:48 UTC (rev 49032)
@@ -167,12 +167,13 @@
 
 /* masklay->blend */
 enum {
-	MASK_BLEND_ADD      = 0,
-	MASK_BLEND_SUBTRACT = 1,
-	MASK_BLEND_LIGHTEN  = 2,
-	MASK_BLEND_DARKEN   = 3,
-	MASK_BLEND_MUL      = 4,
-	MASK_BLEND_REPLACE  = 5,
+	MASK_BLEND_ADD         = 0,
+	MASK_BLEND_SUBTRACT    = 1,
+	MASK_BLEND_LIGHTEN     = 2,
+	MASK_BLEND_DARKEN      = 3,
+	MASK_BLEND_MUL         = 4,
+	MASK_BLEND_REPLACE     = 5,
+	MASK_BLEND_DIFFERENCE  = 6
 };
 
 /* masklay->blend_flag */

Modified: trunk/blender/source/blender/makesrna/intern/rna_mask.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_mask.c	2012-07-18 13:34:14 UTC (rev 49031)
+++ trunk/blender/source/blender/makesrna/intern/rna_mask.c	2012-07-18 13:44:48 UTC (rev 49032)
@@ -585,6 +585,7 @@
 		{MASK_BLEND_DARKEN, "DARKEN", 0, "Darken", ""},
 		{MASK_BLEND_MUL, "MUL", 0, "Multiply", ""},
 		{MASK_BLEND_REPLACE, "REPLACE", 0, "Replace", ""},
+		{MASK_BLEND_DIFFERENCE, "DIFFERENCE", 0, "Difference", ""},
 		{0, NULL, 0, NULL, NULL}
 	};