[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [25256] trunk/blender/source/blender/ render/intern/source/texture.c: Fix #20305: overlay blending mode for specular intensity does not work.

[Brecht Van Lommel]

Revision: 25256
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25256
Author:   blendix
Date:     2009-12-09 20:41:27 +0100 (Wed, 09 Dec 2009)

Log Message:
-----------
Fix #20305: overlay blending mode for specular intensity does not work.

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-12-09 18:47:52 UTC (rev 25255)
+++ trunk/blender/source/blender/render/intern/source/texture.c	2009-12-09 19:41:27 UTC (rev 25256)
@@ -1495,6 +1495,14 @@
 		in= 1.0-(facm+fact*(1.0-tex))*(1.0-out);
 		break;
 
+	case MTEX_OVERLAY:
+		facm= 1.0-facg;
+		if(out < 0.5f)
+			in = out * (facm + 2.0f*fact*tex);
+		else
+			in = 1.0f - (facm + 2.0f*fact*(1.0 - tex)) * (1.0 - out);
+		break;
+
 	case MTEX_SUB:
 		fact= -fact;
 	case MTEX_ADD: