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-05 19:45:10 +0400
committerCampbell Barton <ideasman42@gmail.com>2013-04-05 19:45:10 +0400
commitcf76d73b8386242d7f655974837d7843c774b36c (patch)
tree5a31e591caf725a1b00664b789716b0e35cb1406 /source/blender/compositor/operations
parent12981b004891aa6dbd2334a4c732ba38c1b0c349 (diff)
code cleanup: quiet some warnings and style
Diffstat (limited to 'source/blender/compositor/operations')
-rw-r--r--source/blender/compositor/operations/COM_MixHueOperation.cpp3
-rw-r--r--source/blender/compositor/operations/COM_MixSaturationOperation.cpp3
2 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/compositor/operations/COM_MixHueOperation.cpp b/source/blender/compositor/operations/COM_MixHueOperation.cpp
index 1fa393bb362..8f898cf8ecf 100644
--- a/source/blender/compositor/operations/COM_MixHueOperation.cpp
+++ b/source/blender/compositor/operations/COM_MixHueOperation.cpp
@@ -56,7 +56,8 @@ void MixHueOperation::executePixel(float output[4], float x, float y, PixelSampl
output[0] = valuem * (inputColor1[0]) + value * tmpr;
output[1] = valuem * (inputColor1[1]) + value * tmpg;
output[2] = valuem * (inputColor1[2]) + value * tmpb;
- } else {
+ }
+ else {
copy_v3_v3(output, inputColor1);
}
output[3] = inputColor1[3];
diff --git a/source/blender/compositor/operations/COM_MixSaturationOperation.cpp b/source/blender/compositor/operations/COM_MixSaturationOperation.cpp
index 69207d7fbaa..3ab19748458 100644
--- a/source/blender/compositor/operations/COM_MixSaturationOperation.cpp
+++ b/source/blender/compositor/operations/COM_MixSaturationOperation.cpp
@@ -52,7 +52,8 @@ void MixSaturationOperation::executePixel(float output[4], float x, float y, Pix
float colH, colS, colV;
rgb_to_hsv(inputColor2[0], inputColor2[1], inputColor2[2], &colH, &colS, &colV);
hsv_to_rgb(rH, (valuem * rS + value * colS), rV, &output[0], &output[1], &output[2]);
- } else {
+ }
+ else {
copy_v3_v3(output, inputColor1);
}