[Bf-blender-cvs] [8e655446d1e] master: Fix T51537: Light passes are summed twice for split kernel since denoise commit
Sergey Sharybin
noreply at git.blender.org
Fri May 19 12:15:23 CEST 2017
Commit: 8e655446d1ec667a08a6d351d1e452fc51f1428a
Author: Sergey Sharybin
Date: Fri May 19 12:14:03 2017 +0200
Branches: master
https://developer.blender.org/rB8e655446d1ec667a08a6d351d1e452fc51f1428a
Fix T51537: Light passes are summed twice for split kernel since denoise commit
Denoise commit introduced kernel_write_result() which saves light passes, so
no need to call both kernel_write_result() and kernel_write_light_passes() from
the split kernel.
Weirdly enough. kernel_write_result() does not take care about debug passes.
===================================================================
M intern/cycles/kernel/split/kernel_buffer_update.h
===================================================================
diff --git a/intern/cycles/kernel/split/kernel_buffer_update.h b/intern/cycles/kernel/split/kernel_buffer_update.h
index 1f6dce0253c..4c1fdd2d69c 100644
--- a/intern/cycles/kernel/split/kernel_buffer_update.h
+++ b/intern/cycles/kernel/split/kernel_buffer_update.h
@@ -111,7 +111,6 @@ ccl_device void kernel_buffer_update(KernelGlobals *kg,
buffer += (kernel_split_params.offset + pixel_x + pixel_y*stride) * kernel_data.film.pass_stride;
if(IS_STATE(ray_state, ray_index, RAY_UPDATE_BUFFER)) {
- kernel_write_light_passes(kg, buffer, L, sample);
#ifdef __KERNEL_DEBUG__
kernel_write_debug_passes(kg, buffer, state, debug_data, sample);
#endif
More information about the Bf-blender-cvs
mailing list