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:
Diffstat (limited to 'source/blender/compositor/operations/COM_KeyingOperation.cc')
-rw-r--r--source/blender/compositor/operations/COM_KeyingOperation.cc26
1 files changed, 13 insertions, 13 deletions
diff --git a/source/blender/compositor/operations/COM_KeyingOperation.cc b/source/blender/compositor/operations/COM_KeyingOperation.cc
index 7b0b80b5796..7a7fe716fb5 100644
--- a/source/blender/compositor/operations/COM_KeyingOperation.cc
+++ b/source/blender/compositor/operations/COM_KeyingOperation.cc
@@ -42,22 +42,22 @@ KeyingOperation::KeyingOperation()
this->addInputSocket(DataType::Color);
this->addOutputSocket(DataType::Value);
- m_screenBalance = 0.5f;
+ screenBalance_ = 0.5f;
- m_pixelReader = nullptr;
- m_screenReader = nullptr;
+ pixelReader_ = nullptr;
+ screenReader_ = nullptr;
}
void KeyingOperation::initExecution()
{
- m_pixelReader = this->getInputSocketReader(0);
- m_screenReader = this->getInputSocketReader(1);
+ pixelReader_ = this->getInputSocketReader(0);
+ screenReader_ = this->getInputSocketReader(1);
}
void KeyingOperation::deinitExecution()
{
- m_pixelReader = nullptr;
- m_screenReader = nullptr;
+ pixelReader_ = nullptr;
+ screenReader_ = nullptr;
}
void KeyingOperation::executePixelSampled(float output[4], float x, float y, PixelSampler sampler)
@@ -65,8 +65,8 @@ void KeyingOperation::executePixelSampled(float output[4], float x, float y, Pix
float pixel_color[4];
float screen_color[4];
- m_pixelReader->readSampled(pixel_color, x, y, sampler);
- m_screenReader->readSampled(screen_color, x, y, sampler);
+ pixelReader_->readSampled(pixel_color, x, y, sampler);
+ screenReader_->readSampled(screen_color, x, y, sampler);
const int primary_channel = max_axis_v3(screen_color);
const float min_pixel_color = min_fff(pixel_color[0], pixel_color[1], pixel_color[2]);
@@ -80,8 +80,8 @@ void KeyingOperation::executePixelSampled(float output[4], float x, float y, Pix
output[0] = 1.0f;
}
else {
- float saturation = get_pixel_saturation(pixel_color, m_screenBalance, primary_channel);
- float screen_saturation = get_pixel_saturation(screen_color, m_screenBalance, primary_channel);
+ float saturation = get_pixel_saturation(pixel_color, screenBalance_, primary_channel);
+ float screen_saturation = get_pixel_saturation(screen_color, screenBalance_, primary_channel);
if (saturation < 0) {
/* means main channel of pixel is different from screen,
@@ -124,9 +124,9 @@ void KeyingOperation::update_memory_buffer_partial(MemoryBuffer *output,
it.out[0] = 1.0f;
}
else {
- const float saturation = get_pixel_saturation(pixel_color, m_screenBalance, primary_channel);
+ const float saturation = get_pixel_saturation(pixel_color, screenBalance_, primary_channel);
const float screen_saturation = get_pixel_saturation(
- screen_color, m_screenBalance, primary_channel);
+ screen_color, screenBalance_, primary_channel);
if (saturation < 0) {
/* Means main channel of pixel is different from screen,