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

[Brecht Van Lommel]

Revision: 13864
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=13864
Author:   blendix
Date:     2008-02-25 16:08:46 +0100 (Mon, 25 Feb 2008)

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

Fix for bug #7914: when rendering ray transparency with premul or key,
the alpha channel was set wrong.

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

Modified: trunk/blender/source/blender/render/intern/source/shadeinput.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/shadeinput.c	2008-02-25 13:05:08 UTC (rev 13863)
+++ trunk/blender/source/blender/render/intern/source/shadeinput.c	2008-02-25 15:08:46 UTC (rev 13864)
@@ -130,7 +130,7 @@
 		}
 		/* disable adding of sky for raytransp */
 		if(shi->mat->mode & MA_RAYTRANSP) 
-			if(shi->layflag & SCE_LAY_SKY)
+			if((shi->layflag & SCE_LAY_SKY) && (R.r.alphamode==R_ADDSKY))
 				shr->alpha= 1.0f;
 	}	
 }