Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Bakker <j.bakker@atmind.nl>2012-07-13 16:24:42 +0400
committerJeroen Bakker <j.bakker@atmind.nl>2012-07-13 16:24:42 +0400
commit9987a8fca727d117b1d94587144d704be0b235dd (patch)
treed3f9a7c0b03262e67fd6496fec5d828ba3d51251 /source/blender/compositor/operations/COM_CombineChannelsOperation.cpp
parentbccd5380f56c0cac18a5734e386efeee7b7e6d0f (diff)
Removed parameter from executePixel and initializeTileData.
Diffstat (limited to 'source/blender/compositor/operations/COM_CombineChannelsOperation.cpp')
-rw-r--r--source/blender/compositor/operations/COM_CombineChannelsOperation.cpp10
1 files changed, 5 insertions, 5 deletions
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];
}
}