From cfbf9c324b273a4c45aaa7ebc2dca5bdddaa3aa6 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 14 May 2013 06:58:35 +0000 Subject: style cleanup --- source/blender/compositor/operations/COM_ZCombineOperation.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source/blender/compositor/operations') 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; -- cgit v1.2.3