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_MultilayerImageOperation.cpp
parentfe0d1a381003408dedcd3142a727c77806617150 (diff)
style cleanup: braces, compositor
Diffstat (limited to 'source/blender/compositor/operations/COM_MultilayerImageOperation.cpp')
-rw-r--r--source/blender/compositor/operations/COM_MultilayerImageOperation.cpp14
1 files changed, 9 insertions, 5 deletions
diff --git a/source/blender/compositor/operations/COM_MultilayerImageOperation.cpp b/source/blender/compositor/operations/COM_MultilayerImageOperation.cpp
index 53b71ed528e..df2b762b563 100644
--- a/source/blender/compositor/operations/COM_MultilayerImageOperation.cpp
+++ b/source/blender/compositor/operations/COM_MultilayerImageOperation.cpp
@@ -33,7 +33,7 @@ MultilayerBaseOperation::MultilayerBaseOperation(int pass): BaseImageOperation()
ImBuf* MultilayerBaseOperation::getImBuf() {
RenderPass *rpass;
rpass = (RenderPass *)BLI_findlink(&this->renderlayer->passes, this->passId);
- if(rpass) {
+ if (rpass) {
this->imageUser->pass= this->passId;
BKE_image_multilayer_index(image->rr, this->imageUser);
return BaseImageOperation::getImBuf();
@@ -49,7 +49,8 @@ void MultilayerColorOperation::executePixel(float *color, float x, float y, Pixe
color[1] = 0.0f;
color[2] = 0.0f;
color[3] = 0.0f;
- } else {
+ }
+ else {
if (this->numberOfChannels == 4) {
switch (sampler) {
case COM_PS_NEAREST:
@@ -62,7 +63,8 @@ void MultilayerColorOperation::executePixel(float *color, float x, float y, Pixe
bicubic_interpolation_color(this->buffer, NULL, color, x, y);
break;
}
- } else {
+ }
+ else {
int offset = (yi*this->getWidth()+xi)*3;
color[0] = this->imageBuffer[offset];
color[1] = this->imageBuffer[offset+1];
@@ -76,7 +78,8 @@ void MultilayerValueOperation::executePixel(float *color, float x, float y, Pixe
int xi = x;
if (this->imageBuffer == NULL || xi < 0 || yi < 0 || xi >= this->getWidth() || yi >= this->getHeight() ) {
color[0] = 0.0f;
- } else {
+ }
+ else {
float result = this->imageBuffer[yi*this->getWidth()+xi];
color[0] = result;
}
@@ -87,7 +90,8 @@ void MultilayerVectorOperation::executePixel(float *color, float x, float y, Pix
int xi = x;
if (this->imageBuffer == NULL || xi < 0 || yi < 0 || xi >= this->getWidth() || yi >= this->getHeight() ) {
color[0] = 0.0f;
- } else {
+ }
+ else {
int offset = (yi*this->getWidth()+xi)*3;
color[0] = this->imageBuffer[offset];
color[1] = this->imageBuffer[offset+1];