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.h | |
| parent | 69ab13a7dbc414b41bd9a04a49bac0a9127c583a (diff) | |
quiet all -Wshadow warnings in the compositor.
Diffstat (limited to 'source/blender/compositor/operations/COM_AlphaOverMixedOperation.h')
| -rw-r--r-- | source/blender/compositor/operations/COM_AlphaOverMixedOperation.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/compositor/operations/COM_AlphaOverMixedOperation.h b/source/blender/compositor/operations/COM_AlphaOverMixedOperation.h index 2807b3b489a..24a991da17b 100644 --- a/source/blender/compositor/operations/COM_AlphaOverMixedOperation.h +++ b/source/blender/compositor/operations/COM_AlphaOverMixedOperation.h @@ -20,8 +20,8 @@ * Monique Dewanchand */ -#ifndef _COM_AlphaOverMixedOperation_h -#define _COM_AlphaOverMixedOperation_h +#ifndef _COM_AlphaOverMixedOperation_h_ +#define _COM_AlphaOverMixedOperation_h_ #include "COM_MixBaseOperation.h" @@ -31,7 +31,7 @@ */ class AlphaOverMixedOperation : public MixBaseOperation { private: - float x; + float m_x; public: /** * Default constructor @@ -43,6 +43,6 @@ public: */ void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); - void setX(float x) { this->x = x; } + void setX(float x) { this->m_x = x; } }; #endif |