[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [24427] trunk/blender/source/blender/ render/intern/source/texture.c: Update of older commit (23102) from Bob Holcomb -- fix for Darken mode blending was only in place for nodes , not for general texture blending.

[Roland Hess]

Revision: 24427
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=24427
Author:   harkyman
Date:     2009-11-09 20:20:48 +0100 (Mon, 09 Nov 2009)

Log Message:
-----------
Update of older commit (23102) from Bob Holcomb -- fix for Darken mode blending was only in place for nodes, not for general texture blending. This updates texture blending to reflect the fix. Now results don't trend toward black on Darken anymore as factor approaches 0.

Modified Paths:
--------------
    trunk/blender/source/blender/render/intern/source/texture.c

Modified: trunk/blender/source/blender/render/intern/source/texture.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/texture.c	2009-11-09 18:32:59 UTC (rev 24426)
+++ trunk/blender/source/blender/render/intern/source/texture.c	2009-11-09 19:20:48 UTC (rev 24427)
@@ -1416,11 +1416,11 @@
 		fact*= facg;
 		facm= 1.0-fact;
 		
-		col= fact*tex[0];
+		col= tex[0]+((1-tex[0])*facm);
 		if(col < out[0]) in[0]= col; else in[0]= out[0];
-		col= fact*tex[1];
+		col= tex[1]+((1-tex[1])*facm);
 		if(col < out[1]) in[1]= col; else in[1]= out[1];
-		col= fact*tex[2];
+		col= tex[2]+((1-tex[2])*facm);
 		if(col < out[2]) in[2]= col; else in[2]= out[2];
 		break;