diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-05-17 17:44:15 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-05-17 17:44:15 +0400 |
| commit | 979f6bab9c1aba27b8d018d1481987d841f68ee1 (patch) | |
| tree | 162419d475bf68326b3b5e88b25f27057fee6831 /source/blender/compositor/operations/COM_EllipseMaskOperation.cpp | |
| parent | fe0d1a381003408dedcd3142a727c77806617150 (diff) | |
style cleanup: braces, compositor
Diffstat (limited to 'source/blender/compositor/operations/COM_EllipseMaskOperation.cpp')
| -rw-r--r-- | source/blender/compositor/operations/COM_EllipseMaskOperation.cpp | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/source/blender/compositor/operations/COM_EllipseMaskOperation.cpp b/source/blender/compositor/operations/COM_EllipseMaskOperation.cpp index 033cb4da84d..bc15523c149 100644 --- a/source/blender/compositor/operations/COM_EllipseMaskOperation.cpp +++ b/source/blender/compositor/operations/COM_EllipseMaskOperation.cpp @@ -72,7 +72,8 @@ void EllipseMaskOperation::executePixel(float* color, float x, float y, PixelSam case CMP_NODE_MASKTYPE_ADD: if (inside) { color[0] = max(inputMask[0],inputValue[0]); - } else { + } + else { color[0] = inputMask[0]; } break; @@ -80,14 +81,16 @@ void EllipseMaskOperation::executePixel(float* color, float x, float y, PixelSam if (inside) { color[0] = inputMask[0]-inputValue[0]; CLAMP(color[0], 0, 1); - } else { + } + else { color[0] = inputMask[0]; } break; case CMP_NODE_MASKTYPE_MULTIPLY: if (inside) { color[0] = inputMask[0]*inputValue[0]; - } else { + } + else { color[0] = 0; } break; @@ -95,10 +98,12 @@ void EllipseMaskOperation::executePixel(float* color, float x, float y, PixelSam if (inside) { if (inputMask[0]>0.0f) { color[0] = 0; - } else { + } + else { color[0] = inputValue[0]; } - } else { + } + else { color[0] = inputMask[0]; } break; |