svn merge ^/trunk/blender -r48153:48158
authorCampbell Barton <ideasman42@gmail.com>
Thu, 21 Jun 2012 12:29:48 +0000 (12:29 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 21 Jun 2012 12:29:48 +0000 (12:29 +0000)
1  2 
SConstruct
source/blender/compositor/nodes/COM_MaskNode.cpp
source/blender/editors/space_node/drawnode.c
source/blender/makesdna/DNA_node_types.h
source/blender/makesrna/intern/rna_nodetree.c
source/blender/nodes/composite/nodes/node_composite_mask.c

diff --cc SConstruct
Simple merge
@@@ -55,7 -55,8 +55,8 @@@ void MaskNode::convertToOperations(Exec
  
        operation->setMask(mask);
        operation->setFramenumber(context->getFramenumber());
-       operation->setSmooth((bool)editorNode->custom1);
+       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_NODE_MASK_FEATHER) != 0);
  
        graph->addOperation(operation);
  }
@@@ -70,7 -70,9 +70,9 @@@ static void exec(void *data, bNode *nod
                stackbuf = alloc_compbuf(sx, sy, CB_VAL, TRUE);
                res = stackbuf->rect;
  
-               BKE_mask_rasterize(mask, sx, sy, res, TRUE, node->custom1);
+               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_NODE_MASK_FEATHER) != 0);
  
                if (node->custom1) {
                        PLX_antialias_buffer(res,sx,sy);