[Bf-blender-cvs] [de6b64b] master: Fix use of uninitialized variable in some cases with scatter + emission volume.

Brecht Van Lommel noreply at git.blender.org
Fri Feb 28 00:38:14 CET 2014


Commit: de6b64bca65e340315b5eb3e5f766749efd0404e
Author: Brecht Van Lommel
Date:   Thu Feb 27 21:25:50 2014 +0100
https://developer.blender.org/rBde6b64bca65e340315b5eb3e5f766749efd0404e

Fix use of uninitialized variable in some cases with scatter + emission volume.

===================================================================

M	intern/cycles/kernel/kernel_volume.h

===================================================================

diff --git a/intern/cycles/kernel/kernel_volume.h b/intern/cycles/kernel/kernel_volume.h
index ec0c311..778ab4e 100644
--- a/intern/cycles/kernel/kernel_volume.h
+++ b/intern/cycles/kernel/kernel_volume.h
@@ -257,7 +257,7 @@ ccl_device VolumeIntegrateResult kernel_volume_integrate_homogeneous(KernelGloba
 
 			if(xi < sample_transmittance) {
 				/* no scattering */
-				float3 transmittance = volume_color_attenuation(sigma_t, t);
+				transmittance = volume_color_attenuation(sigma_t, t);
 				float pdf = (transmittance.x + transmittance.y + transmittance.z);
 				new_tp = *throughput * transmittance * (3.0f / pdf);
 			}




More information about the Bf-blender-cvs mailing list