From 979f6bab9c1aba27b8d018d1481987d841f68ee1 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 17 May 2012 13:44:15 +0000 Subject: style cleanup: braces, compositor --- .../compositor/operations/COM_EllipseMaskOperation.cpp | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'source/blender/compositor/operations/COM_EllipseMaskOperation.cpp') 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; -- cgit v1.2.3