diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-09-06 12:31:58 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-09-06 12:31:58 +0300 |
| commit | 8a3adaa48568382c1d0e67fabb8ec3d07b94dd42 (patch) | |
| tree | 6211427d0fe723e99c0f6e5a6779594d31254171 /source/blender/compositor/nodes | |
| parent | 5f669240663649ee5532f935a8178bf9db7b10cf (diff) | |
| parent | bb98eef777cbc3484bfcb50ea460b9c5622e9200 (diff) | |
Merge branch 'master' into blender2.8
Conflicts:
source/blender/editors/space_node/drawnode.c
Diffstat (limited to 'source/blender/compositor/nodes')
| -rw-r--r-- | source/blender/compositor/nodes/COM_MaskNode.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/source/blender/compositor/nodes/COM_MaskNode.cpp b/source/blender/compositor/nodes/COM_MaskNode.cpp index be05840f601..7e29674f9aa 100644 --- a/source/blender/compositor/nodes/COM_MaskNode.cpp +++ b/source/blender/compositor/nodes/COM_MaskNode.cpp @@ -62,7 +62,6 @@ void MaskNode::convertToOperations(NodeConverter &converter, const CompositorCon 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_NO_FEATHER) == 0); if ((editorNode->custom1 & CMP_NODEFLAG_MASK_MOTION_BLUR) && |