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

yse BLI_math for the compositor in more places.

Browse Source
This commit is contained in:
Campbell Barton
2012-06-12 20:04:55 +00:00
parent 7fec7070d7
commit e1241030db
26 changed files with 157 additions and 272 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/blender/compositor/operations/COM_AlphaOverMixedOperation.cpp
View File

@@ -38,16 +38,10 @@ void AlphaOverMixedOperation::executePixel(float outputValue[4], float x, float
inputColor2Operation->read(inputOverColor, x, y, sampler, inputBuffers);
if (inputOverColor[3] <= 0.0f) {
outputValue[0] = inputColor1[0];
outputValue[1] = inputColor1[1];
outputValue[2] = inputColor1[2];
outputValue[3] = inputColor1[3];
copy_v4_v4(outputValue, inputColor1);
}
else if (value[0] == 1.0f && inputOverColor[3] >= 1.0f) {
outputValue[0] = inputOverColor[0];
outputValue[1] = inputOverColor[1];
outputValue[2] = inputOverColor[2];
outputValue[3] = inputOverColor[3];
copy_v4_v4(outputValue, inputOverColor);
}
else {
float addfac = 1.0f - this->x + inputOverColor[3]*this->x;