Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2017-09-09 02:37:54 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2017-09-12 13:50:44 +0300
commitde6ecc82ed2d881d7a827c453a6bb97ce4b84a0d (patch)
tree3f2d030c1ea1e0bbb05811df2b7bc29e4197cf91 /intern/cycles/kernel/kernel_path_branched.h
parent28532f18672b1a2a8d3190f6ec1e7ec861699d66 (diff)
Fix rare firefly in volume equiangular sampling when sampling short distance.
Diffstat (limited to 'intern/cycles/kernel/kernel_path_branched.h')
-rw-r--r--intern/cycles/kernel/kernel_path_branched.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/intern/cycles/kernel/kernel_path_branched.h b/intern/cycles/kernel/kernel_path_branched.h
index dde40674ee6..d4cfe461ac4 100644
--- a/intern/cycles/kernel/kernel_path_branched.h
+++ b/intern/cycles/kernel/kernel_path_branched.h
@@ -376,10 +376,8 @@ ccl_device void kernel_branched_path_integrate(KernelGlobals *kg,
VolumeIntegrateResult result = kernel_volume_decoupled_scatter(kg,
&ps, &pray, &sd, &tp, rphase, rscatter, &volume_segment, NULL, false);
- (void)result;
- kernel_assert(result == VOLUME_PATH_SCATTERED);
-
- if(kernel_path_volume_bounce(kg,
+ if(result == VOLUME_PATH_SCATTERED &&
+ kernel_path_volume_bounce(kg,
&sd,
&tp,
&ps,