diff options
Diffstat (limited to 'source/blender/compositor/operations/COM_MixBaseOperation.cpp')
| -rw-r--r-- | source/blender/compositor/operations/COM_MixBaseOperation.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/source/blender/compositor/operations/COM_MixBaseOperation.cpp b/source/blender/compositor/operations/COM_MixBaseOperation.cpp index 0efab2942b0..fbe92f54aa8 100644 --- a/source/blender/compositor/operations/COM_MixBaseOperation.cpp +++ b/source/blender/compositor/operations/COM_MixBaseOperation.cpp @@ -28,17 +28,17 @@ MixBaseOperation::MixBaseOperation() : NodeOperation() this->addInputSocket(COM_DT_COLOR); this->addInputSocket(COM_DT_COLOR); this->addOutputSocket(COM_DT_COLOR); - this->inputValueOperation = NULL; - this->inputColor1Operation = NULL; - this->inputColor2Operation = NULL; + this->m_inputValueOperation = NULL; + this->m_inputColor1Operation = NULL; + this->m_inputColor2Operation = NULL; this->setUseValueAlphaMultiply(false); } void MixBaseOperation::initExecution() { - this->inputValueOperation = this->getInputSocketReader(0); - this->inputColor1Operation = this->getInputSocketReader(1); - this->inputColor2Operation = this->getInputSocketReader(2); + this->m_inputValueOperation = this->getInputSocketReader(0); + this->m_inputColor1Operation = this->getInputSocketReader(1); + this->m_inputColor2Operation = this->getInputSocketReader(2); } void MixBaseOperation::executePixel(float *outputColor, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]) @@ -47,9 +47,9 @@ void MixBaseOperation::executePixel(float *outputColor, float x, float y, PixelS float inputColor2[4]; float value; - inputValueOperation->read(&value, x, y, sampler, inputBuffers); - inputColor1Operation->read(&inputColor1[0], x, y, sampler, inputBuffers); - inputColor2Operation->read(&inputColor2[0], x, y, sampler, inputBuffers); + this->m_inputValueOperation->read(&value, x, y, sampler, inputBuffers); + this->m_inputColor1Operation->read(&inputColor1[0], x, y, sampler, inputBuffers); + this->m_inputColor2Operation->read(&inputColor2[0], x, y, sampler, inputBuffers); if (this->useValueAlphaMultiply()) { value *= inputColor2[3]; @@ -63,9 +63,9 @@ void MixBaseOperation::executePixel(float *outputColor, float x, float y, PixelS void MixBaseOperation::deinitExecution() { - this->inputValueOperation = NULL; - this->inputColor1Operation = NULL; - this->inputColor2Operation = NULL; + this->m_inputValueOperation = NULL; + this->m_inputColor1Operation = NULL; + this->m_inputColor2Operation = NULL; } void MixBaseOperation::determineResolution(unsigned int resolution[], unsigned int preferredResolution[]) |