Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorManuel Castilla <manzanillawork@gmail.com>2021-10-07 22:36:35 +0300
committerManuel Castilla <manzanillawork@gmail.com>2021-10-08 02:29:02 +0300
commit12a5a605572d742335a4978966444d393792cd28 (patch)
treef06fa16602c175982ca2e5d6ec5b55f387a98cbc /source/blender/compositor/operations/COM_AlphaOverMixedOperation.cc
parenta808c5ae65e8a9fd2271274cbba3038846e5ffee (diff)
Cleanup: Use `_` suffix for non-public members in Compositor
To follow the style guide.
Diffstat (limited to 'source/blender/compositor/operations/COM_AlphaOverMixedOperation.cc')
-rw-r--r--source/blender/compositor/operations/COM_AlphaOverMixedOperation.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/compositor/operations/COM_AlphaOverMixedOperation.cc b/source/blender/compositor/operations/COM_AlphaOverMixedOperation.cc
index 61fab7b3bc8..1df74ffac8e 100644
--- a/source/blender/compositor/operations/COM_AlphaOverMixedOperation.cc
+++ b/source/blender/compositor/operations/COM_AlphaOverMixedOperation.cc
@@ -22,7 +22,7 @@ namespace blender::compositor {
AlphaOverMixedOperation::AlphaOverMixedOperation()
{
- m_x = 0.0f;
+ x_ = 0.0f;
this->flags.can_be_constant = true;
}
@@ -35,9 +35,9 @@ void AlphaOverMixedOperation::executePixelSampled(float output[4],
float inputOverColor[4];
float value[4];
- m_inputValueOperation->readSampled(value, x, y, sampler);
- m_inputColor1Operation->readSampled(inputColor1, x, y, sampler);
- m_inputColor2Operation->readSampled(inputOverColor, x, y, sampler);
+ inputValueOperation_->readSampled(value, x, y, sampler);
+ inputColor1Operation_->readSampled(inputColor1, x, y, sampler);
+ inputColor2Operation_->readSampled(inputOverColor, x, y, sampler);
if (inputOverColor[3] <= 0.0f) {
copy_v4_v4(output, inputColor1);
@@ -46,7 +46,7 @@ void AlphaOverMixedOperation::executePixelSampled(float output[4],
copy_v4_v4(output, inputOverColor);
}
else {
- float addfac = 1.0f - m_x + inputOverColor[3] * m_x;
+ float addfac = 1.0f - x_ + inputOverColor[3] * x_;
float premul = value[0] * addfac;
float mul = 1.0f - value[0] * inputOverColor[3];
@@ -71,7 +71,7 @@ void AlphaOverMixedOperation::update_memory_buffer_row(PixelCursor &p)
copy_v4_v4(p.out, over_color);
}
else {
- const float addfac = 1.0f - m_x + over_color[3] * m_x;
+ const float addfac = 1.0f - x_ + over_color[3] * x_;
const float premul = value * addfac;
const float mul = 1.0f - value * over_color[3];