diff options
author | Campbell Barton <ideasman42@gmail.com> | 2015-08-26 11:37:42 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2015-08-26 11:38:55 +0300 |
commit | 3699ab1843c399b784cb6327a6c888db81e9e6e0 (patch) | |
tree | ba0ac6054ee1c291484e3965fbb70e07934d7a01 /source/blender/compositor/nodes | |
parent | df9f4c2e4f69c74291813c66580e9c763d76de3e (diff) |
Fix T45711: Color spill average algorithm broken
Thanks to @kevindietrich for finding the cause!
Diffstat (limited to 'source/blender/compositor/nodes')
-rw-r--r-- | source/blender/compositor/nodes/COM_ColorSpillNode.cpp | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/source/blender/compositor/nodes/COM_ColorSpillNode.cpp b/source/blender/compositor/nodes/COM_ColorSpillNode.cpp index c3a911e830b..f33f2858397 100644 --- a/source/blender/compositor/nodes/COM_ColorSpillNode.cpp +++ b/source/blender/compositor/nodes/COM_ColorSpillNode.cpp @@ -38,16 +38,10 @@ void ColorSpillNode::convertToOperations(NodeConverter &converter, const Composi NodeOutput *outputSocketImage = this->getOutputSocket(0); ColorSpillOperation *operation; - if (editorsnode->custom2 == 0) { - // Simple color spill - operation = new ColorSpillOperation(); - } - else { - // Average color spill - operation = new ColorSpillAverageOperation(); - } + operation = new ColorSpillOperation(); operation->setSettings((NodeColorspill *)editorsnode->storage); operation->setSpillChannel(editorsnode->custom1 - 1); // Channel for spilling + operation->setSpillMethod(editorsnode->custom2); // Channel method converter.addOperation(operation); converter.mapInputSocket(inputSocketImage, operation->getInputSocket(0)); |