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>2013-04-08 08:39:09 +0400
committerCampbell Barton <ideasman42@gmail.com>2013-04-08 08:39:09 +0400
commitfcf137dbd7f31a22657a9fb5c460ee599bff4853 (patch)
treebeb4ba3e6548561ca7aad67e19acc5a0e75c3413 /source/blender/compositor
parent45669ebbc6fab86e1576378b75298116009a2318 (diff)
style cleanup
Diffstat (limited to 'source/blender/compositor')
-rw-r--r--source/blender/compositor/operations/COM_ZCombineOperation.cpp20
1 files changed, 10 insertions, 10 deletions
diff --git a/source/blender/compositor/operations/COM_ZCombineOperation.cpp b/source/blender/compositor/operations/COM_ZCombineOperation.cpp
index 97a4aefbfac..4368ba4f9a0 100644
--- a/source/blender/compositor/operations/COM_ZCombineOperation.cpp
+++ b/source/blender/compositor/operations/COM_ZCombineOperation.cpp
@@ -125,10 +125,10 @@ void ZCombineMaskOperation::executePixel(float output[4], float x, float y, Pixe
float fac = mask[0];
// multiply mask with alpha, if mask == 0 color1, else color2 make sure
- float mfac = 1.0f-fac;
- output[0] = color1[0]*mfac + color2[0]*fac;
- output[1] = color1[1]*mfac + color2[1]*fac;
- output[2] = color1[2]*mfac + color2[2]*fac;
+ float mfac = 1.0f - fac;
+ output[0] = color1[0] * mfac + color2[0] * fac;
+ output[1] = color1[1] * mfac + color2[1] * fac;
+ output[2] = color1[2] * mfac + color2[2] * fac;
output[3] = max(color1[3], color2[3]);
}
@@ -144,13 +144,13 @@ void ZCombineMaskAlphaOperation::executePixel(float output[4], float x, float y,
float fac = mask[0];
// multiply mask with alpha, if mask == 0 color1, else color2 make sure
- float mfac = 1.0f-fac;
- float alpha = color1[3]*mfac + color2[3]*fac;
+ float mfac = 1.0f - fac;
+ float alpha = color1[3] * mfac + color2[3] * fac;
float facalpha = fac * alpha;
- mfac = 1.0f-facalpha;
- output[0] = color1[0]*mfac + color2[0]*facalpha;
- output[1] = color1[1]*mfac + color2[1]*facalpha;
- output[2] = color1[2]*mfac + color2[2]*facalpha;
+ mfac = 1.0f - facalpha;
+ output[0] = color1[0] * mfac + color2[0] * facalpha;
+ output[1] = color1[1] * mfac + color2[1] * facalpha;
+ output[2] = color1[2] * mfac + color2[2] * facalpha;
output[3] = max(color1[3], color2[3]);
}