[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30869] trunk/blender/source/blender/ render/intern/source/volumetric.c: Fix weird colours in areas of high transmission when camera inside a volume .

[Matt Ebb]

Revision: 30869
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30869
Author:   broken
Date:     2010-07-29 09:22:43 +0200 (Thu, 29 Jul 2010)

Log Message:
-----------
Fix weird colours in areas of high transmission when camera inside a volume.

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

Modified: trunk/blender/source/blender/render/intern/source/volumetric.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/volumetric.c	2010-07-29 07:21:57 UTC (rev 30868)
+++ trunk/blender/source/blender/render/intern/source/volumetric.c	2010-07-29 07:22:43 UTC (rev 30869)
@@ -786,8 +786,7 @@
 	MatInside *m;
 	Material *mat_backup;
 	ObjectInstanceRen *obi_backup;
-	float prev_alpha = shr->alpha;
-	
+
 	/* XXX: extend to multiple volumes perhaps later */
 	mat_backup = shi->mat;
 	obi_backup = shi->obi;
@@ -797,10 +796,10 @@
 	shi->obi = m->obi;
 	shi->obr = m->obi->obr;
 	
-	volume_trace(shi, shr, VOL_SHADE_INSIDE);
-	shr->alpha += prev_alpha;
-	CLAMP(shr->alpha, 0.f, 1.f);
+	memset(shr, 0, sizeof(ShadeResult));
 	
+	volume_trace(shi, shr, VOL_SHADE_INSIDE);
+
 	shi->mat = mat_backup;
 	shi->obi = obi_backup;
 	shi->obr = obi_backup->obr;