[Bf-blender-cvs] [858b58f] cycles-ptex-49: Small Ptex alpha cleanup

Nicholas Bishop noreply at git.blender.org
Tue Feb 10 15:33:43 CET 2015


Commit: 858b58f7794f129f721ec16b1e6b941012b437b3
Author: Nicholas Bishop
Date:   Tue Feb 10 14:12:20 2015 +0100
Branches: cycles-ptex-49
https://developer.blender.org/rB858b58f7794f129f721ec16b1e6b941012b437b3

Small Ptex alpha cleanup

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

M	source/blender/blenkernel/intern/bke_ptex.c

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

diff --git a/source/blender/blenkernel/intern/bke_ptex.c b/source/blender/blenkernel/intern/bke_ptex.c
index b346000..81526ea 100644
--- a/source/blender/blenkernel/intern/bke_ptex.c
+++ b/source/blender/blenkernel/intern/bke_ptex.c
@@ -624,15 +624,14 @@ static bool ptex_pack_loops(Image **image, Mesh *me, MLoopPtex *loop_ptex,
 		BPX_image_buf_free(bpx_src);
 	}
 
-	// TODO
-	IMB_rectfill_alpha(ibuf, 1);
+	BPX_image_buf_free(bpx_dst);
 	ptex_filter_borders_update(ibuf, me);
 
-	BPX_image_buf_free(bpx_dst);
+	if (texel_info.num_channels < 4) {
+		IMB_rectfill_alpha(ibuf, 1);
+	}
 
 	// TODO
-	IMB_rectfill_alpha(ibuf, 1);
-
 	IMB_float_from_rect(ibuf);
 
 	(*image) = BKE_image_add_from_imbuf(ibuf);




More information about the Bf-blender-cvs mailing list