diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-06-26 11:32:24 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-06-26 11:32:24 +0400 |
commit | d4cfdc69ef95728a39f085283ba812cec856d757 (patch) | |
tree | 4d705b15a2123a8ae67406436c7e9a9ddbf676cf /source/blender/compositor/operations/COM_AlphaOverMixedOperation.cpp | |
parent | 69ab13a7dbc414b41bd9a04a49bac0a9127c583a (diff) |
quiet all -Wshadow warnings in the compositor.
Diffstat (limited to 'source/blender/compositor/operations/COM_AlphaOverMixedOperation.cpp')
-rw-r--r-- | source/blender/compositor/operations/COM_AlphaOverMixedOperation.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/compositor/operations/COM_AlphaOverMixedOperation.cpp b/source/blender/compositor/operations/COM_AlphaOverMixedOperation.cpp index b521a2a5415..e56fb9151f2 100644 --- a/source/blender/compositor/operations/COM_AlphaOverMixedOperation.cpp +++ b/source/blender/compositor/operations/COM_AlphaOverMixedOperation.cpp @@ -24,7 +24,7 @@ AlphaOverMixedOperation::AlphaOverMixedOperation() : MixBaseOperation() { - this->x = 0.0f; + this->m_x = 0.0f; } void AlphaOverMixedOperation::executePixel(float outputValue[4], float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]) @@ -44,7 +44,7 @@ void AlphaOverMixedOperation::executePixel(float outputValue[4], float x, float copy_v4_v4(outputValue, inputOverColor); } else { - float addfac = 1.0f - this->x + inputOverColor[3] * this->x; + float addfac = 1.0f - this->m_x + inputOverColor[3] * this->m_x; float premul = value[0] * addfac; float mul = 1.0f - value[0] * inputOverColor[3]; |