archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

fix [#36248] Crash using factor input on color mix node.

Browse Source
This commit is contained in:
Campbell Barton
2013-07-22 19:59:07 +00:00
parent 6e98932e90
commit 3f53c33d4a
21 changed files with 123 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
source/blender/compositor/operations/COM_MixSaturationOperation.cpp
View File

@@ -35,12 +35,13 @@ void MixSaturationOperation::executePixel(float output[4], float x, float y, Pix
{
float inputColor1[4];
float inputColor2[4];
float value;
float inputValue[4];
this->m_inputValueOperation->read(&value, 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 = inputValue[0];
if (this->useValueAlphaMultiply()) {
value *= inputColor2[3];
}