[Bf-blender-cvs] [6c372530b43] master: Cleanup: We do not use camel case in Blender code
Sergey Sharybin
noreply at git.blender.org
Tue Nov 21 17:35:19 CET 2017
Commit: 6c372530b43931d1159e5ae82beaf36859ce08ca
Author: Sergey Sharybin
Date: Tue Nov 21 17:34:44 2017 +0100
Branches: master
https://developer.blender.org/rB6c372530b43931d1159e5ae82beaf36859ce08ca
Cleanup: We do not use camel case in Blender code
At least not for variables.
===================================================================
M source/blender/compositor/operations/COM_KeyingOperation.cpp
===================================================================
diff --git a/source/blender/compositor/operations/COM_KeyingOperation.cpp b/source/blender/compositor/operations/COM_KeyingOperation.cpp
index 873a537efe3..fa0ef70fca6 100644
--- a/source/blender/compositor/operations/COM_KeyingOperation.cpp
+++ b/source/blender/compositor/operations/COM_KeyingOperation.cpp
@@ -67,14 +67,14 @@ void KeyingOperation::deinitExecution()
void KeyingOperation::executePixelSampled(float output[4], float x, float y, PixelSampler sampler)
{
- float pixelColor[4];
- float screenColor[4];
+ float pixel_color[4];
+ float screen_color[4];
- this->m_pixelReader->readSampled(pixelColor, x, y, sampler);
- this->m_screenReader->readSampled(screenColor, x, y, sampler);
+ this->m_pixelReader->readSampled(pixel_color, x, y, sampler);
+ this->m_screenReader->readSampled(screen_color, x, y, sampler);
- const int primary_channel = max_axis_v3(screenColor);
- const float min_pixel_color = min_fff(pixelColor[0], pixelColor[1], pixelColor[2]);
+ 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]);
if (min_pixel_color > 1.0f) {
/* overexposure doesn't happen on screen itself and usually happens
@@ -85,8 +85,8 @@ void KeyingOperation::executePixelSampled(float output[4], float x, float y, Pix
output[0] = 1.0f;
}
else {
- float saturation = get_pixel_saturation(pixelColor, this->m_screenBalance, primary_channel);
- float screen_saturation = get_pixel_saturation(screenColor, this->m_screenBalance, primary_channel);
+ float saturation = get_pixel_saturation(pixel_color, this->m_screenBalance, primary_channel);
+ float screen_saturation = get_pixel_saturation(screen_color, this->m_screenBalance, primary_channel);
if (saturation < 0) {
/* means main channel of pixel is different from screen,
More information about the Bf-blender-cvs
mailing list