diff options
Diffstat (limited to 'source/blender/compositor/operations/COM_CombineChannelsOperation.cpp')
| -rw-r--r-- | source/blender/compositor/operations/COM_CombineChannelsOperation.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/source/blender/compositor/operations/COM_CombineChannelsOperation.cpp b/source/blender/compositor/operations/COM_CombineChannelsOperation.cpp index efeac9db410..6b64934f0b8 100644 --- a/source/blender/compositor/operations/COM_CombineChannelsOperation.cpp +++ b/source/blender/compositor/operations/COM_CombineChannelsOperation.cpp @@ -23,7 +23,8 @@ #include "COM_CombineChannelsOperation.h" #include <stdio.h> -CombineChannelsOperation::CombineChannelsOperation() : NodeOperation() { +CombineChannelsOperation::CombineChannelsOperation() : NodeOperation() +{ this->addInputSocket(COM_DT_VALUE); this->addInputSocket(COM_DT_VALUE); this->addInputSocket(COM_DT_VALUE); @@ -35,14 +36,16 @@ CombineChannelsOperation::CombineChannelsOperation() : NodeOperation() { this->inputChannel3Operation = NULL; this->inputChannel4Operation = NULL; } -void CombineChannelsOperation::initExecution() { +void CombineChannelsOperation::initExecution() +{ this->inputChannel1Operation = this->getInputSocketReader(0); this->inputChannel2Operation = this->getInputSocketReader(1); this->inputChannel3Operation = this->getInputSocketReader(2); this->inputChannel4Operation = this->getInputSocketReader(3); } -void CombineChannelsOperation::deinitExecution() { +void CombineChannelsOperation::deinitExecution() +{ this->inputChannel1Operation = NULL; this->inputChannel2Operation = NULL; this->inputChannel3Operation = NULL; @@ -50,7 +53,8 @@ void CombineChannelsOperation::deinitExecution() { } -void CombineChannelsOperation::executePixel(float *color,float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]) { +void CombineChannelsOperation::executePixel(float *color,float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]) +{ float input[4]; /// @todo: remove if statements if (this->inputChannel1Operation) { |