Fix rare firefly in volume equiangular sampling when sampling short distance.

2017-09-09 01:37:54 +02:00
parent 28532f1867
commit de6ecc82ed
3 changed files with 10 additions and 18 deletions
--- 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,