[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [13443] trunk/blender/source/blender/ render/intern/source/zbuf.c:

[Brecht Van Lommel]

Revision: 13443
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=13443
Author:   blendix
Date:     2008-01-28 23:43:16 +0100 (Mon, 28 Jan 2008)

Log Message:
-----------

- Fix for adding rendering passes. It seems the result was multiplied
  by alpha twice, which gave dark edges on an grass AO pass for example.

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

Modified: trunk/blender/source/blender/render/intern/source/zbuf.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/zbuf.c	2008-01-28 22:34:14 UTC (rev 13442)
+++ trunk/blender/source/blender/render/intern/source/zbuf.c	2008-01-28 22:43:16 UTC (rev 13443)
@@ -3590,10 +3590,10 @@
 		if(col) {
 
 			fp= rpass->rect + pixsize*offset;
-			fp[0]= alpha*col[0] + (1.0f-alpha)*fp[0];
+			fp[0]= col[0] + (1.0f-alpha)*fp[0];
 			if(pixsize==3) {
-				fp[1]= alpha*col[1] + (1.0f-alpha)*fp[1];
-				fp[2]= alpha*col[2] + (1.0f-alpha)*fp[2];
+				fp[1]= col[1] + (1.0f-alpha)*fp[1];
+				fp[2]= col[2] + (1.0f-alpha)*fp[2];
 			}
 		}
 	}