diff options
author | Campbell Barton <ideasman42@gmail.com> | 2013-07-22 23:59:07 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2013-07-22 23:59:07 +0400 |
commit | 3f53c33d4abd1dfb3bc32e96fce83d7bbe63b902 (patch) | |
tree | 7abfdb6325368e8deed24c2e1d761a8d9c35e021 /source/blender/compositor/operations/COM_MixScreenOperation.cpp | |
parent | 6e98932e90df7575f371f492f31b0f7f9da713fa (diff) |
fix [#36248] Crash using factor input on color mix node.
Diffstat (limited to 'source/blender/compositor/operations/COM_MixScreenOperation.cpp')
-rw-r--r-- | source/blender/compositor/operations/COM_MixScreenOperation.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/compositor/operations/COM_MixScreenOperation.cpp b/source/blender/compositor/operations/COM_MixScreenOperation.cpp index 671ffd3303c..511768a49ad 100644 --- a/source/blender/compositor/operations/COM_MixScreenOperation.cpp +++ b/source/blender/compositor/operations/COM_MixScreenOperation.cpp @@ -31,13 +31,13 @@ void MixScreenOperation::executePixel(float output[4], float x, float y, PixelSa { float inputColor1[4]; float inputColor2[4]; - float valuev[4]; + float inputValue[4]; - this->m_inputValueOperation->read(valuev, x, y, sampler); - this->m_inputColor1Operation->read(&inputColor1[0], x, y, sampler); - this->m_inputColor2Operation->read(&inputColor2[0], x, y, sampler); + this->m_inputValueOperation->read(inputValue, x, y, sampler); + this->m_inputColor1Operation->read(inputColor1, x, y, sampler); + this->m_inputColor2Operation->read(inputColor2, x, y, sampler); - float value = valuev[0]; + float value = inputValue[0]; if (this->useValueAlphaMultiply()) { value *= inputColor2[3]; } |