Fix for 34703 Mix node (Hue, Saturation) update and rendering error

Fix for 34494 Blender 2.65 regression test error - compo_map_uv_cubes.blend - stripe/artifact between cubes

Hue and saturation node has an early break when saturarion is 0. When this happened the input 1 color needed to be used. This behaviour was not merged.

When no FSAA is used in the ZCombine. a mask will be created, this mask will be antialiased and based on this mask the colors between the two images are blended. This was also behaviour that was not merged correctly. Now it is back making much better z-combines.

Hope nobody uses these gabs as a work around.

 - At Mind -
Jeroen & Monique

1 files changed, 16 insertions, 0 deletions

diff --git a/source/blender/compositor/operations/COM_ZCombineOperation.h b/source/blender/compositor/operations/COM_ZCombineOperation.h
index 61ceca340f7..4545775f26f 100644
--- a/source/blender/compositor/operations/COM_ZCombineOperation.h
+++ b/source/blender/compositor/operations/COM_ZCombineOperation.h
@@ -54,4 +54,20 @@ class ZCombineAlphaOperation : public ZCombineOperation {
 	void executePixel(float output[4], float x, float y, PixelSampler sampler);
 };
 
+class ZCombineMaskOperation : public NodeOperation {
+protected:
+	SocketReader *m_maskReader;
+	SocketReader *m_image1Reader;
+	SocketReader *m_image2Reader;
+public:
+	ZCombineMaskOperation();
+
+	void initExecution();
+	void deinitExecution();
+	void executePixel(float output[4], float x, float y, PixelSampler sampler);
+};
+class ZCombineMaskAlphaOperation : public ZCombineMaskOperation {
+	void executePixel(float output[4], float x, float y, PixelSampler sampler);
+};
+
 #endif