diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-05-14 10:58:35 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-05-14 10:58:35 +0400 |
| commit | cfbf9c324b273a4c45aaa7ebc2dca5bdddaa3aa6 (patch) | |
| tree | 069db7df2f0ee7087dda5939f4832b081e6c8945 /source/blender/compositor/operations | |
| parent | 5888830acbf9d5bd2d7bd317928366d45371c507 (diff) | |
style cleanup
Diffstat (limited to 'source/blender/compositor/operations')
| -rw-r--r-- | source/blender/compositor/operations/COM_ZCombineOperation.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/compositor/operations/COM_ZCombineOperation.cpp b/source/blender/compositor/operations/COM_ZCombineOperation.cpp index 10090294a54..7db91a40fb7 100644 --- a/source/blender/compositor/operations/COM_ZCombineOperation.cpp +++ b/source/blender/compositor/operations/COM_ZCombineOperation.cpp @@ -136,7 +136,7 @@ void ZCombineMaskAlphaOperation::executePixel(float output[4], float x, float y, this->m_image1Reader->read(color1, x, y, sampler); this->m_image2Reader->read(color2, x, y, sampler); - float fac = (1.0f - mask[0])*(1.0f - color1[3]) + mask[0]*color2[3]; + float fac = (1.0f - mask[0]) * (1.0f - color1[3]) + mask[0] * color2[3]; float mfac = 1.0f - fac; output[0] = color1[0] * mfac + color2[0] * fac; |