[Bf-blender-cvs] [5cb363c] bake-cycles: Cycles-Bake: support non-alpha saving of png, openexr, ...

[Dalai Felinto]

Commit: 5cb363c134b06fb9fe214395d5ec08d3ee06b977
Author: Dalai Felinto
Date:   Wed Mar 19 14:54:47 2014 -0300
https://developer.blender.org/rB5cb363c134b06fb9fe214395d5ec08d3ee06b977

Cycles-Bake: support non-alpha saving of png, openexr, ...

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

M	source/blender/render/intern/source/bake_new.c

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

diff --git a/source/blender/render/intern/source/bake_new.c b/source/blender/render/intern/source/bake_new.c
index b20bb5c..7ca48e1 100644
--- a/source/blender/render/intern/source/bake_new.c
+++ b/source/blender/render/intern/source/bake_new.c
@@ -140,7 +140,12 @@ void RE_bake_margin(BakePixel pixel_array[], ImBuf *ibuf, const int margin, cons
 		}
 	}
 
-	RE_bake_ibuf_filter(ibuf, mask_buffer, margin);
+	/* margin */
+	IMB_filter_extend(ibuf, mask_buffer, margin);
+
+	if (ibuf->planes != R_IMF_PLANES_RGBA)
+		/* clear alpha added by filtering */
+		IMB_rectfill_alpha(ibuf, 1.0f);
 
 	MEM_freeN(mask_buffer);
 }