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 | |
| 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')
| -rw-r--r-- | source/blender/compositor/nodes/COM_MaskNode.cpp | 1 | ||||
| -rw-r--r-- | source/blender/compositor/operations/COM_MaskOperation.cpp | 4 | ||||
| -rw-r--r-- | source/blender/compositor/operations/COM_MaskOperation.h | 2 |
3 files changed, 2 insertions, 5 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) && diff --git a/source/blender/compositor/operations/COM_MaskOperation.cpp b/source/blender/compositor/operations/COM_MaskOperation.cpp index caafdfe8f0c..efc9f6edd5b 100644 --- a/source/blender/compositor/operations/COM_MaskOperation.cpp +++ b/source/blender/compositor/operations/COM_MaskOperation.cpp @@ -54,7 +54,7 @@ void MaskOperation::initExecution() BKE_maskrasterize_handle_init(this->m_rasterMaskHandles[0], this->m_mask, this->m_maskWidth, this->m_maskHeight, - true, this->m_do_smooth, this->m_do_feather); + true, true, this->m_do_feather); } else { /* make a throw away copy of the mask */ @@ -88,7 +88,7 @@ void MaskOperation::initExecution() BKE_maskrasterize_handle_init(this->m_rasterMaskHandles[i], mask_temp, this->m_maskWidth, this->m_maskHeight, - true, this->m_do_smooth, this->m_do_feather); + true, true, this->m_do_feather); frame_iter += frame_step; } diff --git a/source/blender/compositor/operations/COM_MaskOperation.h b/source/blender/compositor/operations/COM_MaskOperation.h index a586a91682e..02c0e61c31e 100644 --- a/source/blender/compositor/operations/COM_MaskOperation.h +++ b/source/blender/compositor/operations/COM_MaskOperation.h @@ -48,7 +48,6 @@ protected: float m_frame_shutter; int m_frame_number; - bool m_do_smooth; bool m_do_feather; struct MaskRasterHandle *m_rasterMaskHandles[CMP_NODE_MASK_MBLUR_SAMPLES_MAX]; @@ -80,7 +79,6 @@ public: this->m_mask_px_ofs[1] = this->m_maskHeightInv * 0.5f; } void setFramenumber(int frame_number) { this->m_frame_number = frame_number; } - void setSmooth(bool smooth) { this->m_do_smooth = smooth; } void setFeather(bool feather) { this->m_do_feather = feather; } void setMotionBlurSamples(int samples) { this->m_rasterMaskHandleTot = min(max(1, samples), CMP_NODE_MASK_MBLUR_SAMPLES_MAX); } |