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-18 02:55:28 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-05-18 02:55:28 +0400
commit7862b2fa13c0437d9c17eae78e7b79a421dacf05 (patch)
tree08f9c26af3e71795d0f65803a415b5612d6b53ab /source/blender/compositor/operations/COM_MixLightenOperation.cpp
parent69b95e1a8a00c9ff146d803b8ec11183d7a68908 (diff)
style cleanup: compositor, pointer syntax, function brace placement, line length
Diffstat (limited to 'source/blender/compositor/operations/COM_MixLightenOperation.cpp')
-rw-r--r--source/blender/compositor/operations/COM_MixLightenOperation.cpp12
1 files changed, 7 insertions, 5 deletions
diff --git a/source/blender/compositor/operations/COM_MixLightenOperation.cpp b/source/blender/compositor/operations/COM_MixLightenOperation.cpp
index 6a06d5ab6e1..bc3e5090bd8 100644
--- a/source/blender/compositor/operations/COM_MixLightenOperation.cpp
+++ b/source/blender/compositor/operations/COM_MixLightenOperation.cpp
@@ -22,10 +22,12 @@
#include "COM_MixLightenOperation.h"
-MixLightenOperation::MixLightenOperation(): MixBaseOperation() {
+MixLightenOperation::MixLightenOperation(): MixBaseOperation()
+{
}
-void MixLightenOperation::executePixel(float* outputValue, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]) {
+void MixLightenOperation::executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[])
+{
float inputColor1[4];
float inputColor2[4];
float value;
@@ -39,13 +41,13 @@ void MixLightenOperation::executePixel(float* outputValue, float x, float y, Pix
}
float tmp;
tmp=value * inputColor2[0];
- if (tmp > inputColor1[0]) outputValue[0]= tmp;
+ if (tmp > inputColor1[0]) outputValue[0] = tmp;
else outputValue[0] = inputColor1[0];
tmp=value * inputColor2[1];
- if (tmp > inputColor1[1]) outputValue[1]= tmp;
+ if (tmp > inputColor1[1]) outputValue[1] = tmp;
else outputValue[1] = inputColor1[1];
tmp=value * inputColor2[2];
- if (tmp > inputColor1[2]) outputValue[2]= tmp;
+ if (tmp > inputColor1[2]) outputValue[2] = tmp;
else outputValue[2] = inputColor1[2];
outputValue[3] = inputColor1[3];
}