[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48160] trunk/blender/source/blender: error in last commit

[Campbell Barton]

Revision: 48160
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48160
Author:   campbellbarton
Date:     2012-06-21 12:36:00 +0000 (Thu, 21 Jun 2012)
Log Message:
-----------
error in last commit

Modified Paths:
--------------
    trunk/blender/source/blender/compositor/nodes/COM_MaskNode.cpp
    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:29:48 UTC (rev 48159)
+++ trunk/blender/source/blender/compositor/nodes/COM_MaskNode.cpp	2012-06-21 12:36:00 UTC (rev 48160)
@@ -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_NODE_MASK_FEATHER) != 0);
+	operation->setFeather((bool)(editorNode->custom1 & CMP_NODEFLAG_MASK_FEATHER) != 0);
 
 	graph->addOperation(operation);
 }

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:29:48 UTC (rev 48159)
+++ trunk/blender/source/blender/nodes/composite/nodes/node_composite_mask.c	2012-06-21 12:36:00 UTC (rev 48160)
@@ -72,7 +72,7 @@
 
 		BKE_mask_rasterize(mask, sx, sy, res, TRUE,
 		                   (node->custom1 & CMP_NODEFLAG_MASK_AA) != 0,
-		                   (node->custom1 & CMP_NODE_MASK_FEATHER) != 0);
+		                   (node->custom1 & CMP_NODEFLAG_MASK_FEATHER) != 0);
 
 		if (node->custom1) {
 			PLX_antialias_buffer(res,sx,sy);