[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [17069] trunk/blender/source/blender/ render/intern/source/envmap.c: Bugfix on IRC report.

[Ton Roosendaal]

Revision: 17069
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17069
Author:   ton
Date:     2008-10-14 13:42:53 +0200 (Tue, 14 Oct 2008)

Log Message:
-----------
Bugfix on IRC report. Luckily Daniel Salazar *does* carefully check our
regression files, it showed small dark outline errors on envmap.

This commit rewinds bugfix #8437, which actually had to be fixed on
another location in code, which was done a few weeks ago. :)

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

Modified: trunk/blender/source/blender/render/intern/source/envmap.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/envmap.c	2008-10-14 10:55:18 UTC (rev 17068)
+++ trunk/blender/source/blender/render/intern/source/envmap.c	2008-10-14 11:42:53 UTC (rev 17069)
@@ -640,7 +640,7 @@
 	/* texvec should be the already reflected normal */
 	EnvMap *env;
 	ImBuf *ibuf;
-	float fac, vec[3], sco[3], dxts[3], dyts[3], w[3];
+	float fac, vec[3], sco[3], dxts[3], dyts[3];
 	int face, face1;
 	
 	env= tex->env;
@@ -722,15 +722,9 @@
 			if(fac!=0.0) {
 				fac= 1.0/fac;
 
-				/* weight contributions based on alpha */
-				w[0]= texres->ta*fac;
-				w[1]= texr1.ta*fac;
-				w[2]= texr2.ta*fac;
-				
-				/* interpolate premultiplied result (imagewraposa returns key) */
-				texres->tr= (w[0]*texres->ta*texres->tr + w[1]*texr1.ta*texr1.tr + w[2]*texr2.ta*texr2.tr);
-				texres->tg= (w[0]*texres->ta*texres->tg + w[1]*texr1.ta*texr1.tg + w[2]*texr2.ta*texr2.tg);
-				texres->tb= (w[0]*texres->ta*texres->tb + w[1]*texr1.ta*texr1.tb + w[2]*texr2.ta*texr2.tb);
+				texres->tr= fac*(texres->ta*texres->tr + texr1.ta*texr1.tr + texr2.ta*texr2.tr );
+				texres->tg= fac*(texres->ta*texres->tg + texr1.ta*texr1.tg + texr2.ta*texr2.tg );
+				texres->tb= fac*(texres->ta*texres->tb + texr1.ta*texr1.tb + texr2.ta*texr2.tb );
 			}
 			texres->ta= 1.0;
 		}