[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [12787] trunk/blender/source/blender/ render/intern/source/imagetexture.c: Bugfix: de-premul for image texture didn't happen for non-osa case.

[Ton Roosendaal]

Revision: 12787
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=12787
Author:   ton
Date:     2007-12-04 20:06:00 +0100 (Tue, 04 Dec 2007)

Log Message:
-----------
Bugfix: de-premul for image texture didn't happen for non-osa case.

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

Modified: trunk/blender/source/blender/render/intern/source/imagetexture.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/imagetexture.c	2007-12-04 18:34:28 UTC (rev 12786)
+++ trunk/blender/source/blender/render/intern/source/imagetexture.c	2007-12-04 19:06:00 UTC (rev 12787)
@@ -244,6 +244,14 @@
 	
 	if(tex->flag & TEX_NEGALPHA) texres->ta= 1.0f-texres->ta;
 
+	/* de-premul, this is being premulled in shade_input_do_shade() */
+	if(texres->ta!=1.0f && texres->ta!=0.0f) {
+		fx= 1.0f/texres->ta;
+		texres->tr*= fx;
+		texres->tg*= fx;
+		texres->tb*= fx;
+	}
+	
 	return retval;
 }