[Bf-blender-cvs] [5bdea81] master: Cycles: Don't check closure flag in kernel_volume_decoupled_scatter(), we check this before the function already.

Thomas Dinges noreply at git.blender.org
Thu Aug 14 21:26:05 CEST 2014


Commit: 5bdea81319393ae79f69774fc524b7b8a49c0bbb
Author: Thomas Dinges
Date:   Thu Aug 14 21:25:29 2014 +0200
Branches: master
https://developer.blender.org/rB5bdea81319393ae79f69774fc524b7b8a49c0bbb

Cycles: Don't check closure flag in kernel_volume_decoupled_scatter(), we check this before the function already.

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

M	intern/cycles/kernel/kernel_volume.h

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

diff --git a/intern/cycles/kernel/kernel_volume.h b/intern/cycles/kernel/kernel_volume.h
index 9e78d43..8004013 100644
--- a/intern/cycles/kernel/kernel_volume.h
+++ b/intern/cycles/kernel/kernel_volume.h
@@ -738,10 +738,7 @@ ccl_device VolumeIntegrateResult kernel_volume_decoupled_scatter(
 	float3 *throughput, float rphase, float rscatter,
 	const VolumeSegment *segment, const float3 *light_P, bool probalistic_scatter)
 {
-	int closure_flag = segment->closure_flag;
-
-	if(!(closure_flag & SD_SCATTER))
-		return VOLUME_PATH_MISSED;
+	kernel_assert(segment->closure_flag & SD_SCATTER);
 
 	/* pick random color channel, we use the Veach one-sample
 	 * model with balance heuristic for the channels */




More information about the Bf-blender-cvs mailing list