diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-06-21 16:29:48 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-06-21 16:29:48 +0400 |
commit | 86f9f3e439b10007a844aba931276a870355f909 (patch) | |
tree | 6208ced17301a0b55ec67e824a123f21d5df0a53 /source/blender/compositor/nodes/COM_MaskNode.cpp | |
parent | 78b2f5df4743b52319e211e77d6ce1b0cd049afa (diff) | |
parent | 54156e2b824c9e5a4293060b194630630d1f9dc7 (diff) |
svn merge ^/trunk/blender -r48153:48158
Diffstat (limited to 'source/blender/compositor/nodes/COM_MaskNode.cpp')
-rw-r--r-- | source/blender/compositor/nodes/COM_MaskNode.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/compositor/nodes/COM_MaskNode.cpp b/source/blender/compositor/nodes/COM_MaskNode.cpp index ed07e41a649..15917d4920b 100644 --- a/source/blender/compositor/nodes/COM_MaskNode.cpp +++ b/source/blender/compositor/nodes/COM_MaskNode.cpp @@ -55,7 +55,8 @@ void MaskNode::convertToOperations(ExecutionSystem *graph, CompositorContext *co 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_NODE_MASK_FEATHER) != 0); graph->addOperation(operation); } |