Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2012-05-17 17:44:15 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-05-17 17:44:15 +0400
commit979f6bab9c1aba27b8d018d1481987d841f68ee1 (patch)
tree162419d475bf68326b3b5e88b25f27057fee6831 /source/blender/compositor/operations/COM_ZCombineOperation.cpp
parentfe0d1a381003408dedcd3142a727c77806617150 (diff)
style cleanup: braces, compositor
Diffstat (limited to 'source/blender/compositor/operations/COM_ZCombineOperation.cpp')
-rw-r--r--source/blender/compositor/operations/COM_ZCombineOperation.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/compositor/operations/COM_ZCombineOperation.cpp b/source/blender/compositor/operations/COM_ZCombineOperation.cpp
index 9aa06df1ead..e45d66dd597 100644
--- a/source/blender/compositor/operations/COM_ZCombineOperation.cpp
+++ b/source/blender/compositor/operations/COM_ZCombineOperation.cpp
@@ -52,7 +52,8 @@ void ZCombineOperation::executePixel(float* color, float x, float y, PixelSample
this->depth2Reader->read(depth2, x, y, sampler, inputBuffers);
if (depth1[0]<depth2[0]) {
this->image1Reader->read(color, x, y, sampler, inputBuffers);
- } else {
+ }
+ else {
this->image2Reader->read(color, x, y, sampler, inputBuffers);
}
}
@@ -67,7 +68,8 @@ void ZCombineAlphaOperation::executePixel(float* color, float x, float y, PixelS
if (depth1[0]<depth2[0]) {
this->image1Reader->read(color1, x, y, sampler, inputBuffers);
this->image2Reader->read(color2, x, y, sampler, inputBuffers);
- } else {
+ }
+ else {
this->image1Reader->read(color2, x, y, sampler, inputBuffers);
this->image2Reader->read(color1, x, y, sampler, inputBuffers);
}