[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [12661] trunk/blender/source/blender/ render/intern/source/imagetexture.c: Bugfix #7802

[Ton Roosendaal]

Revision: 12661
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=12661
Author:   ton
Date:     2007-11-23 15:48:26 +0100 (Fri, 23 Nov 2007)

Log Message:
-----------
Bugfix #7802

Fixed very old annoyance in alpha render: when using alpha textures images,
nicely premulled as Blender wants it, you still got dark outlines at the
edges. This because the blender shading pipeline also premultiplies.

Solution: de-premul image texture colors after sampling.

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-11-23 14:10:05 UTC (rev 12660)
+++ trunk/blender/source/blender/render/intern/source/imagetexture.c	2007-11-23 14:48:26 UTC (rev 12661)
@@ -968,5 +968,14 @@
 		texres->nor[2] = 2.f*(texres->tb - 0.5f);
 	}
 	
+	/* 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;
 }