diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-06-21 16:38:09 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-06-21 16:38:09 +0400 |
| commit | 27c10cdf32be3c2b84c7f655712f09ba2a94e501 (patch) | |
| tree | 3daf2eaa233e2b043eeda4154209b928d64578ac /source/blender/compositor/nodes | |
| parent | 86f9f3e439b10007a844aba931276a870355f909 (diff) | |
| parent | 54156e2b824c9e5a4293060b194630630d1f9dc7 (diff) | |
svn merge ^/trunk/blender -r48158:48160
Diffstat (limited to 'source/blender/compositor/nodes')
| -rw-r--r-- | source/blender/compositor/nodes/COM_MaskNode.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/compositor/nodes/COM_MaskNode.cpp b/source/blender/compositor/nodes/COM_MaskNode.cpp index 15917d4920b..d0b6120198f 100644 --- a/source/blender/compositor/nodes/COM_MaskNode.cpp +++ b/source/blender/compositor/nodes/COM_MaskNode.cpp @@ -56,7 +56,7 @@ void MaskNode::convertToOperations(ExecutionSystem *graph, CompositorContext *co 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); } |