Commit: 70c27e0e44855b5c97e2131a0327f5ec8d5d6ac5
Author: Jeroen Bakker
Date: Tue Jul 1 20:39:09 2014 +0200
https://developer.blender.org/rB70c27e0e44855b5c97e2131a0327f5ec8d5d6ac5
Merge remote-tracking branch 'blender-upstream/master' into blender-tiles
===================================================================
===================================================================
diff --cc source/blender/compositor/operations/COM_RenderLayersProg.cpp
index a037997,06f4f6d..2d6a505
--- a/source/blender/compositor/operations/COM_RenderLayersProg.cpp
+++ b/source/blender/compositor/operations/COM_RenderLayersProg.cpp
@@@ -202,10 -204,15 +202,15 @@@ void RenderLayersAlphaProg::executePixe
float *inputBuffer = this->getInputBuffer();
if (inputBuffer == NULL) {
- zero_v4(output);
+ output[0] = 0.0f;
}
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;
}
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
