[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48163] branches/soc-2011-tomato: svn merge ^/trunk/blender -r48160:48162

[Campbell Barton]

Revision: 48163
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48163
Author:   campbellbarton
Date:     2012-06-21 12:46:33 +0000 (Thu, 21 Jun 2012)
Log Message:
-----------
svn merge ^/trunk/blender -r48160:48162

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48160

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

Property Changed:
----------------
    branches/soc-2011-tomato/
    branches/soc-2011-tomato/source/blender/editors/interface/interface.c
    branches/soc-2011-tomato/source/blender/editors/space_outliner/


Property changes on: branches/soc-2011-tomato
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-48160
   + /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-48162

Modified: branches/soc-2011-tomato/source/blender/compositor/nodes/COM_MaskNode.cpp
===================================================================
--- branches/soc-2011-tomato/source/blender/compositor/nodes/COM_MaskNode.cpp	2012-06-21 12:45:53 UTC (rev 48162)
+++ branches/soc-2011-tomato/source/blender/compositor/nodes/COM_MaskNode.cpp	2012-06-21 12:46:33 UTC (rev 48163)
@@ -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);
 }


Property changes on: branches/soc-2011-tomato/source/blender/editors/interface/interface.c
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/ge_candy/source/blender/editors/interface/interface.c:45070-46163
/branches/ge_harmony/source/blender/editors/interface/interface.c:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber/source/blender/editors/interface/interface.c:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers/source/blender/editors/interface/interface.c:38694-39989
/trunk/blender/source/blender/editors/interface/interface.c:36831-48160
   + /branches/ge_candy/source/blender/editors/interface/interface.c:45070-46163
/branches/ge_harmony/source/blender/editors/interface/interface.c:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber/source/blender/editors/interface/interface.c:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers/source/blender/editors/interface/interface.c:38694-39989
/trunk/blender/source/blender/editors/interface/interface.c:36831-48162


Property changes on: branches/soc-2011-tomato/source/blender/editors/space_outliner
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/soc-2011-cucumber/source/blender/editors/space_outliner:38968,38970,38973,39045,40845
/branches/soc-2011-pepper/source/blender/editors/space_outliner:36831-38987
/trunk/blender/source/blender/editors/space_outliner:36831-48160
   + /branches/soc-2011-cucumber/source/blender/editors/space_outliner:38968,38970,38973,39045,40845
/branches/soc-2011-pepper/source/blender/editors/space_outliner:36831-38987
/trunk/blender/source/blender/editors/space_outliner:36831-48162

Modified: branches/soc-2011-tomato/source/blender/makesdna/DNA_node_types.h
===================================================================
--- branches/soc-2011-tomato/source/blender/makesdna/DNA_node_types.h	2012-06-21 12:45:53 UTC (rev 48162)
+++ branches/soc-2011-tomato/source/blender/makesdna/DNA_node_types.h	2012-06-21 12:46:33 UTC (rev 48163)
@@ -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: branches/soc-2011-tomato/source/blender/makesrna/intern/rna_nodetree.c
===================================================================
--- branches/soc-2011-tomato/source/blender/makesrna/intern/rna_nodetree.c	2012-06-21 12:45:53 UTC (rev 48162)
+++ branches/soc-2011-tomato/source/blender/makesrna/intern/rna_nodetree.c	2012-06-21 12:46:33 UTC (rev 48163)
@@ -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: branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_mask.c
===================================================================
--- branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_mask.c	2012-06-21 12:45:53 UTC (rev 48162)
+++ branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_mask.c	2012-06-21 12:46:33 UTC (rev 48163)
@@ -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);