[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48162] trunk/blender/source/blender: negate previous commit flag, this way existing files dont loose their feather.

[Campbell Barton]

Revision: 48162
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48162
Author:   campbellbarton
Date:     2012-06-21 12:45:53 +0000 (Thu, 21 Jun 2012)
Log Message:
-----------
negate previous commit flag, this way existing files dont loose their feather.

Modified Paths:
--------------
    trunk/blender/source/blender/compositor/nodes/COM_MaskNode.cpp
    trunk/blender/source/blender/makesdna/DNA_node_types.h
    trunk/blender/source/blender/makesrna/intern/rna_nodetree.c
    trunk/blender/source/blender/nodes/composite/nodes/node_composite_mask.c

Modified: trunk/blender/source/blender/compositor/nodes/COM_MaskNode.cpp
===================================================================
--- trunk/blender/source/blender/compositor/nodes/COM_MaskNode.cpp	2012-06-21 12:38:09 UTC (rev 48161)
+++ trunk/blender/source/blender/compositor/nodes/COM_MaskNode.cpp	2012-06-21 12:45:53 UTC (rev 48162)
@@ -56,7 +56,7 @@
 	operation->setMask(mask);
 	operation->setFramenumber(context->getFramenumber());
 	operation->setSmooth((bool)(editorNode->custom1 & CMP_NODEFLAG_MASK_AA) != 0);
-	operation->setFeather((bool)(editorNode->custom1 & CMP_NODEFLAG_MASK_FEATHER) != 0);
+	operation->setFeather((bool)(editorNode->custom1 & CMP_NODEFLAG_MASK_NO_FEATHER) == 0);
 
 	graph->addOperation(operation);
 }

Modified: trunk/blender/source/blender/makesdna/DNA_node_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_node_types.h	2012-06-21 12:38:09 UTC (rev 48161)
+++ trunk/blender/source/blender/makesdna/DNA_node_types.h	2012-06-21 12:45:53 UTC (rev 48162)
@@ -369,8 +369,8 @@
 };
 
 enum {
-	CMP_NODEFLAG_MASK_AA      = (1 << 0),
-	CMP_NODEFLAG_MASK_FEATHER = (1 << 1)
+	CMP_NODEFLAG_MASK_AA         = (1 << 0),
+	CMP_NODEFLAG_MASK_NO_FEATHER = (1 << 1)
 };
 
 typedef struct NodeFrame {

Modified: trunk/blender/source/blender/makesrna/intern/rna_nodetree.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_nodetree.c	2012-06-21 12:38:09 UTC (rev 48161)
+++ trunk/blender/source/blender/makesrna/intern/rna_nodetree.c	2012-06-21 12:45:53 UTC (rev 48162)
@@ -3131,8 +3131,8 @@
 	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 
 	prop = RNA_def_property(srna, "use_feather", PROP_BOOLEAN, PROP_NONE);
-	RNA_def_property_boolean_sdna(prop, NULL, "custom1", CMP_NODE_MASK_ELLIPSE);
-	RNA_def_property_ui_text(prop, "Feather", "Apply an anti-aliasing filter to the mask");
+	RNA_def_property_boolean_negative_sdna(prop, NULL, "custom1", CMP_NODEFLAG_MASK_NO_FEATHER);
+	RNA_def_property_ui_text(prop, "Feather", "Use feather information from the mask");
 	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 }
 

Modified: trunk/blender/source/blender/nodes/composite/nodes/node_composite_mask.c
===================================================================
--- trunk/blender/source/blender/nodes/composite/nodes/node_composite_mask.c	2012-06-21 12:38:09 UTC (rev 48161)
+++ trunk/blender/source/blender/nodes/composite/nodes/node_composite_mask.c	2012-06-21 12:45:53 UTC (rev 48162)
@@ -72,7 +72,7 @@
 
 		BKE_mask_rasterize(mask, sx, sy, res, TRUE,
 		                   (node->custom1 & CMP_NODEFLAG_MASK_AA) != 0,
-		                   (node->custom1 & CMP_NODEFLAG_MASK_FEATHER) != 0);
+		                   (node->custom1 & CMP_NODEFLAG_MASK_NO_FEATHER) == 0);
 
 		if (node->custom1) {
 			PLX_antialias_buffer(res,sx,sy);