[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [33242] trunk/blender/source/blender/nodes /intern/SHD_nodes/SHD_material.c: Fix #24596: specular toggle on material didn't work correct.

Brecht Van Lommel brechtvanlommel at pandora.be
Mon Nov 22 23:23:51 CET 2010


Revision: 33242
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33242
Author:   blendix
Date:     2010-11-22 23:23:50 +0100 (Mon, 22 Nov 2010)

Log Message:
-----------
Fix #24596: specular toggle on material didn't work correct.

Modified Paths:
--------------
    trunk/blender/source/blender/nodes/intern/SHD_nodes/SHD_material.c

Modified: trunk/blender/source/blender/nodes/intern/SHD_nodes/SHD_material.c
===================================================================
--- trunk/blender/source/blender/nodes/intern/SHD_nodes/SHD_material.c	2010-11-22 20:54:26 UTC (rev 33241)
+++ trunk/blender/source/blender/nodes/intern/SHD_nodes/SHD_material.c	2010-11-22 22:23:50 UTC (rev 33242)
@@ -235,10 +235,12 @@
 		
 		/* write to outputs */
 		if(node->custom1 & SH_NODE_MAT_DIFF) {
-			if(node->custom1 & SH_NODE_MAT_SPEC)
-				out[MAT_OUT_COLOR].link= shr.combined;
-			else
-				out[MAT_OUT_COLOR].link= shr.diff;
+			out[MAT_OUT_COLOR].link= shr.combined;
+
+			if(!(node->custom1 & SH_NODE_MAT_SPEC)) {
+				GPUNodeLink *link;
+				GPU_link(mat, "vec_math_sub", shr.combined, shr.spec, &out[MAT_OUT_COLOR].link, &link);
+			}
 		}
 		else if(node->custom1 & SH_NODE_MAT_SPEC) {
 			out[MAT_OUT_COLOR].link= shr.spec;





More information about the Bf-blender-cvs mailing list