Merging r58475 through r58700 from trunk into soc-2013-depsgraph_mt
[blender.git] / source / blender / compositor / operations / COM_MixColorOperation.cpp
index 56aca27eaef0d75596b1b83436991f1ecbea0e8b..6919a636aeb40713aa424ec979f82ecc35564be5 100644 (file)
@@ -35,12 +35,13 @@ void MixColorOperation::executePixel(float output[4], float x, float y, PixelSam
 {
        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];
        }