From 9987a8fca727d117b1d94587144d704be0b235dd Mon Sep 17 00:00:00 2001 From: Jeroen Bakker Date: Fri, 13 Jul 2012 12:24:42 +0000 Subject: Removed parameter from executePixel and initializeTileData. --- .../compositor/operations/COM_CombineChannelsOperation.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'source/blender/compositor/operations/COM_CombineChannelsOperation.cpp') diff --git a/source/blender/compositor/operations/COM_CombineChannelsOperation.cpp b/source/blender/compositor/operations/COM_CombineChannelsOperation.cpp index 9f175a381a4..d05040c4c12 100644 --- a/source/blender/compositor/operations/COM_CombineChannelsOperation.cpp +++ b/source/blender/compositor/operations/COM_CombineChannelsOperation.cpp @@ -78,24 +78,24 @@ 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) { float input[4]; /// @todo: remove if statements if (this->m_inputChannel1Operation) { - this->m_inputChannel1Operation->read(input, x, y, sampler, inputBuffers); + this->m_inputChannel1Operation->read(input, x, y, sampler); color[0] = input[0]; } if (this->m_inputChannel2Operation) { - this->m_inputChannel2Operation->read(input, x, y, sampler, inputBuffers); + this->m_inputChannel2Operation->read(input, x, y, sampler); color[1] = input[0]; } if (this->m_inputChannel3Operation) { - this->m_inputChannel3Operation->read(input, x, y, sampler, inputBuffers); + this->m_inputChannel3Operation->read(input, x, y, sampler); color[2] = input[0]; } if (this->m_inputChannel4Operation) { - this->m_inputChannel4Operation->read(input, x, y, sampler, inputBuffers); + this->m_inputChannel4Operation->read(input, x, y, sampler); color[3] = input[0]; } } -- cgit v1.2.3