griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix new compositor color to value/bw conversion working different than it did

Browse Source 
before. It doesn't make much sense to always multiply with alpha, especially
if it's a premul image that already has it multiplied in.

Patch by Irie Shinsuke.
This commit is contained in:
Brecht Van Lommel
2012-05-24 14:19:20 +00:00
parent 240babf074
commit 09344fb102
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/compositor/operations/COM_ConvertColorToBWOperation.cpp
View File

@@ -38,7 +38,7 @@ void ConvertColorToBWOperation::executePixel(float *outputValue, float x, float
{
float inputColor[4];
inputOperation->read(&inputColor[0], x, y, sampler, inputBuffers);
outputValue[0] = (inputColor[0]*0.35f + inputColor[1]*0.45f + inputColor[2]*0.2f)*inputColor[3];
outputValue[0] = inputColor[0]*0.35f + inputColor[1]*0.45f + inputColor[2]*0.2f;
}
void ConvertColorToBWOperation::deinitExecution()

2
source/blender/compositor/operations/COM_ConvertColourToValueProg.cpp
View File

@@ -38,7 +38,7 @@ void ConvertColourToValueProg::executePixel(float *outputValue, float x, float y
{
float inputColor[4];
inputOperation->read(&inputColor[0], x, y, sampler, inputBuffers);
outputValue[0] = ((inputColor[0] + inputColor[1] + inputColor[2])/3.0f)*inputColor[3];
outputValue[0] = (inputColor[0] + inputColor[1] + inputColor[2])/3.0f;
}
void ConvertColourToValueProg::deinitExecution()