[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56658] trunk/blender/source/blender: Fix #35278: textures nodes Mix RGB node did not have a Use Alpha option like

[Brecht Van Lommel]

Revision: 56658
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56658
Author:   blendix
Date:     2013-05-10 12:39:11 +0000 (Fri, 10 May 2013)
Log Message:
-----------
Fix #35278: textures nodes Mix RGB node did not have a Use Alpha option like
the compositing node. Note the shader nodes can't have this because color
sockets there are only RGB, not RGBA.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_node/drawnode.c
    trunk/blender/source/blender/nodes/texture/nodes/node_texture_mixRgb.c

Modified: trunk/blender/source/blender/editors/space_node/drawnode.c
===================================================================
--- trunk/blender/source/blender/editors/space_node/drawnode.c	2013-05-10 12:38:19 UTC (rev 56657)
+++ trunk/blender/source/blender/editors/space_node/drawnode.c	2013-05-10 12:39:11 UTC (rev 56658)
@@ -177,7 +177,7 @@
 	col = uiLayoutColumn(layout, FALSE);
 	row = uiLayoutRow(col, TRUE);
 	uiItemR(row, ptr, "blend_type", 0, "", ICON_NONE);
-	if (ntree->type == NTREE_COMPOSIT)
+	if (ELEM(ntree->type, NTREE_COMPOSIT, NTREE_TEXTURE))
 		uiItemR(row, ptr, "use_alpha", 0, "", ICON_IMAGE_RGB_ALPHA);
 
 	uiItemR(col, ptr, "use_clamp", 0, NULL, ICON_NONE);

Modified: trunk/blender/source/blender/nodes/texture/nodes/node_texture_mixRgb.c
===================================================================
--- trunk/blender/source/blender/nodes/texture/nodes/node_texture_mixRgb.c	2013-05-10 12:38:19 UTC (rev 56657)
+++ trunk/blender/source/blender/nodes/texture/nodes/node_texture_mixRgb.c	2013-05-10 12:39:11 UTC (rev 56658)
@@ -52,6 +52,10 @@
 	
 	tex_input_rgba(col1, in[1], p, thread);
 	tex_input_rgba(col2, in[2], p, thread);
+
+	/* use alpha */
+	if (node->custom2 & 1)
+		fac *= col2[3];
 	
 	CLAMP(fac, 0.0f, 1.0f);