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_SplitViewerOperation.cpp | |
parent | fe0d1a381003408dedcd3142a727c77806617150 (diff) |
style cleanup: braces, compositor
Diffstat (limited to 'source/blender/compositor/operations/COM_SplitViewerOperation.cpp')
-rw-r--r-- | source/blender/compositor/operations/COM_SplitViewerOperation.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/source/blender/compositor/operations/COM_SplitViewerOperation.cpp b/source/blender/compositor/operations/COM_SplitViewerOperation.cpp index f9000cc63da..f2d5e491001 100644 --- a/source/blender/compositor/operations/COM_SplitViewerOperation.cpp +++ b/source/blender/compositor/operations/COM_SplitViewerOperation.cpp @@ -77,17 +77,20 @@ void SplitViewerOperation::executeRegion(rcti *rect, unsigned int tileNumber, Me image1 = xSplit?x>perc:y>perc; if (image1) { image1Input->read(&(buffer[offset]), x, y, COM_PS_NEAREST, memoryBuffers); - } else { + } + else { image2Input->read(&(buffer[offset]), x, y, COM_PS_NEAREST, memoryBuffers); } /// @todo: linear conversion only when scene color management is selected, also check predivide. if (this->doColorManagement) { - if(this->doColorPredivide) { + if (this->doColorPredivide) { linearrgb_to_srgb_predivide_v4(srgb, buffer+offset); - } else { + } + else { linearrgb_to_srgb_v4(srgb, buffer+offset); } - } else { + } + else { copy_v4_v4(srgb, buffer+offset); } |