[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [12767] trunk/blender/source/blender/ render/intern/source/texture.c: Blending mode "Overlay" was not coded yet for material blending.

Ton Roosendaal ton at blender.org
Mon Dec 3 17:06:34 CET 2007


Revision: 12767
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=12767
Author:   ton
Date:     2007-12-03 17:06:34 +0100 (Mon, 03 Dec 2007)

Log Message:
-----------
Blending mode "Overlay" was not coded yet for material blending.

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	2007-12-03 10:52:56 UTC (rev 12766)
+++ trunk/blender/source/blender/render/intern/source/texture.c	2007-12-03 16:06:34 UTC (rev 12767)
@@ -1272,6 +1272,24 @@
 		in[2]= 1.0 - (facm+fact*(1.0-tex[2])) * (1.0-out[2]);
 		break;
 
+	case MTEX_OVERLAY:
+		fact*= facg;
+		facm= 1.0-facg;
+		
+		if(out[0] < 0.5f)
+			in[0] = out[0] * (facm + 2.0f*fact*tex[0]);
+		else
+			in[0] = 1.0f - (facm + 2.0f*fact*(1.0 - tex[0])) * (1.0 - out[0]);
+		if(out[1] < 0.5f)
+			in[1] = out[1] * (facm + 2.0f*fact*tex[1]);
+		else
+			in[1] = 1.0f - (facm + 2.0f*fact*(1.0 - tex[1])) * (1.0 - out[1]);
+		if(out[2] < 0.5f)
+			in[2] = out[2] * (facm + 2.0f*fact*tex[2]);
+		else
+			in[2] = 1.0f - (facm + 2.0f*fact*(1.0 - tex[2])) * (1.0 - out[2]);
+		break;
+		
 	case MTEX_SUB:
 		fact= -fact;
 	case MTEX_ADD:





More information about the Bf-blender-cvs mailing list