[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [33708] trunk/blender/source/blender/ render/intern/source/rayshade.c: Bugfix #23658

Ton Roosendaal ton at blender.org
Thu Dec 16 12:31:04 CET 2010


Revision: 33708
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33708
Author:   ton
Date:     2010-12-16 12:31:04 +0100 (Thu, 16 Dec 2010)

Log Message:
-----------
Bugfix #23658

Render: Alpha calculated for ray-traced transparency could overflow beyond 1.0.
Gets clamped now.

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

Modified: trunk/blender/source/blender/render/intern/source/rayshade.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/rayshade.c	2010-12-16 10:25:41 UTC (rev 33707)
+++ trunk/blender/source/blender/render/intern/source/rayshade.c	2010-12-16 11:31:04 UTC (rev 33708)
@@ -1492,7 +1492,7 @@
 		if(!(shi->combinedflag & SCE_PASS_REFRACT))
 			VECSUB(diff, diff, shr->refr);
 		
-		shr->alpha= tracol[3];
+		shr->alpha= MIN2(1.0f, tracol[3]);
 	}
 	
 	if(do_mir) {





More information about the Bf-blender-cvs mailing list