diff options
| author | Thomas Dinges <blender@dingto.org> | 2014-08-14 23:25:29 +0400 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2014-08-14 23:25:52 +0400 |
| commit | 5bdea81319393ae79f69774fc524b7b8a49c0bbb (patch) | |
| tree | 43aa028c42ef8df5ef583b1bbda21295716b9da5 | |
| parent | da1801969b3e32b68c5b431b9dce4961a55f8ff4 (diff) | |
Cycles: Don't check closure flag in kernel_volume_decoupled_scatter(), we check this before the function already.
| -rw-r--r-- | intern/cycles/kernel/kernel_volume.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/intern/cycles/kernel/kernel_volume.h b/intern/cycles/kernel/kernel_volume.h index 9e78d43efdf..8004013552c 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 */ |