blender
/
blender
136
411
Fork 593
Code Issues 6.3k Pull Requests 772 Projects 19 Wiki Activity

Compositor: Use BLI_color in convert alpha node. 

Recently the CPP colors module landed in master. This patch will use the
new module in the convert alpha node.
This commit is contained in:
Jeroen Bakker 2021-05-26 09:28:01 +02:00
parent 1e6b028580
commit e6c0e6c2a9
1 changed files with 10 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
source/blender/compositor/operations/COM_ConvertOperation.cc
View File

@ -18,6 +18,8 @@
#include "COM_ConvertOperation.h"
#include "BLI_color.hh"
#include "IMB_colormanagement.h"
namespace blender::compositor {
@ -355,21 +357,10 @@ void ConvertPremulToStraightOperation::executePixelSampled(float output[4],
float y,
PixelSampler sampler)
{
float inputValue[4];
float alpha;
this->m_inputOperation->readSampled(inputValue, x, y, sampler);
alpha = inputValue[3];
if (fabsf(alpha) < 1e-5f) {
zero_v3(output);
}
else {
mul_v3_v3fl(output, inputValue, 1.0f / alpha);
}
/* never touches the alpha */
output[3] = alpha;
ColorSceneLinear4f<eAlpha::Premultiplied> input;
this->m_inputOperation->readSampled(input, x, y, sampler);
ColorSceneLinear4f<eAlpha::Straight> converted = input.unpremultiply_alpha();
copy_v4_v4(output, converted);
}
/* ******** Straight to Premul ******** */
@ -385,16 +376,10 @@ void ConvertStraightToPremulOperation::executePixelSampled(float output[4],
float y,
PixelSampler sampler)
{
float inputValue[4];
float alpha;
this->m_inputOperation->readSampled(inputValue, x, y, sampler);
alpha = inputValue[3];
mul_v3_v3fl(output, inputValue, alpha);
/* never touches the alpha */
output[3] = alpha;
ColorSceneLinear4f<eAlpha::Straight> input;
this->m_inputOperation->readSampled(input, x, y, sampler);
ColorSceneLinear4f<eAlpha::Premultiplied> converted = input.premultiply_alpha();
copy_v4_v4(output, converted);
}
/* ******** Separate Channels ******** */