archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

quiet all -Wshadow warnings in the compositor.

Browse Source
This commit is contained in:
Campbell Barton
2012-06-26 07:32:24 +00:00
parent 69ab13a7db
commit d4cfdc69ef
12 changed files with 170 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/compositor/operations/COM_AlphaOverMixedOperation.cpp
View File

@@ -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];