Merge branch 'master' into blender2.8

1 files changed, 3 insertions, 3 deletions

diff --git a/source/blender/compositor/operations/COM_AlphaOverKeyOperation.cpp b/source/blender/compositor/operations/COM_AlphaOverKeyOperation.cpp
index 928525f2594..e6ae9b5fc8b 100644
--- a/source/blender/compositor/operations/COM_AlphaOverKeyOperation.cpp
+++ b/source/blender/compositor/operations/COM_AlphaOverKeyOperation.cpp
@@ -32,11 +32,11 @@ void AlphaOverKeyOperation::executePixelSampled(float output[4], float x, float
 	float inputColor1[4];
 	float inputOverColor[4];
 	float value[4];
-	
+
 	this->m_inputValueOperation->readSampled(value, x, y, sampler);
 	this->m_inputColor1Operation->readSampled(inputColor1, x, y, sampler);
 	this->m_inputColor2Operation->readSampled(inputOverColor, x, y, sampler);
-	
+
 	if (inputOverColor[3] <= 0.0f) {
 		copy_v4_v4(output, inputColor1);
 	}
@@ -46,7 +46,7 @@ void AlphaOverKeyOperation::executePixelSampled(float output[4], float x, float
 	else {
 		float premul = value[0] * inputOverColor[3];
 		float mul = 1.0f - premul;
-	
+
 		output[0] = (mul * inputColor1[0]) + premul * inputOverColor[0];
 		output[1] = (mul * inputColor1[1]) + premul * inputOverColor[1];
 		output[2] = (mul * inputColor1[2]) + premul * inputOverColor[2];