diff options
author | Campbell Barton <ideasman42@gmail.com> | 2013-04-05 19:45:10 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2013-04-05 19:45:10 +0400 |
commit | cf76d73b8386242d7f655974837d7843c774b36c (patch) | |
tree | 5a31e591caf725a1b00664b789716b0e35cb1406 /source/blender/compositor | |
parent | 12981b004891aa6dbd2334a4c732ba38c1b0c349 (diff) |
code cleanup: quiet some warnings and style
Diffstat (limited to 'source/blender/compositor')
3 files changed, 6 insertions, 3 deletions
diff --git a/source/blender/compositor/nodes/COM_ZCombineNode.cpp b/source/blender/compositor/nodes/COM_ZCombineNode.cpp index 35eedf435f6..82effaf0eda 100644 --- a/source/blender/compositor/nodes/COM_ZCombineNode.cpp +++ b/source/blender/compositor/nodes/COM_ZCombineNode.cpp @@ -67,7 +67,8 @@ void ZCombineNode::convertToOperations(ExecutionSystem *system, CompositorContex system->addOperation(zoperation); } } - } else { + } + else { // not full anti alias, use masking for Z combine. be aware it uses anti aliasing. // step 1 create mask MathGreaterThanOperation *maskoperation = new MathGreaterThanOperation(); 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); } |