[Bf-blender-cvs] [ecc2e29] master: Fix T40903: Rendering: Alpha Channel is Broken

[Sergey Sharybin]

Commit: ecc2e298e8799c568840ead430264304cfc47250
Author: Sergey Sharybin
Date:   Tue Jul 1 22:11:44 2014 +0600
https://developer.blender.org/rBecc2e298e8799c568840ead430264304cfc47250

Fix T40903: Rendering: Alpha Channel is Broken

===================================================================

M	source/blender/compositor/operations/COM_RenderLayersProg.cpp

===================================================================

diff --git a/source/blender/compositor/operations/COM_RenderLayersProg.cpp b/source/blender/compositor/operations/COM_RenderLayersProg.cpp
index 7141dd7..06f4f6d 100644
--- a/source/blender/compositor/operations/COM_RenderLayersProg.cpp
+++ b/source/blender/compositor/operations/COM_RenderLayersProg.cpp
@@ -207,7 +207,12 @@ void RenderLayersAlphaProg::executePixelSampled(float output[4], float x, float
 		zero_v4(output);
 	}
 	else {
-		doInterpolation(output, x, y, sampler);
+		float temp[4];
+		doInterpolation(temp, x, y, sampler);
+		output[0] = temp[3];
+		output[1] = 0.0f;
+		output[2] = 0.0f;
+		output[3] = 0.0f;
 	}
 }