diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2016-02-19 02:39:00 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2016-02-19 02:49:24 +0300 |
| commit | 3c4f9713920e4724bc0bf44ed4dc2fdf24ba3400 (patch) | |
| tree | eb267749005f6532267bbb8a7cd9fb89fb71c6b3 /intern/cycles/kernel/kernel_path_branched.h | |
| parent | 1d15421af97980e4a149490fe31a325fed070853 (diff) | |
Workaround for T47213: branched path sampling issues with CUDA 7.5.
Diffstat (limited to 'intern/cycles/kernel/kernel_path_branched.h')
| -rw-r--r-- | intern/cycles/kernel/kernel_path_branched.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/intern/cycles/kernel/kernel_path_branched.h b/intern/cycles/kernel/kernel_path_branched.h index 7c685e3b191..13ae4cf669b 100644 --- a/intern/cycles/kernel/kernel_path_branched.h +++ b/intern/cycles/kernel/kernel_path_branched.h @@ -194,7 +194,7 @@ ccl_device void kernel_branched_path_subsurface_scatter(KernelGlobals *kg, #ifdef __EMISSION__ /* direct light */ if(kernel_data.integrator.use_direct_light) { - bool all = kernel_data.integrator.sample_all_lights_direct; + int all = kernel_data.integrator.sample_all_lights_direct; kernel_branched_path_surface_connect_light( kg, rng, @@ -297,7 +297,7 @@ ccl_device float4 kernel_branched_path_integrate(KernelGlobals *kg, RNG *rng, in if(volume_segment.closure_flag & SD_SCATTER) { volume_segment.sampling_method = volume_stack_sampling_method(kg, state.volume_stack); - bool all = kernel_data.integrator.sample_all_lights_direct; + int all = kernel_data.integrator.sample_all_lights_direct; kernel_branched_path_volume_connect_light(kg, rng, &volume_sd, throughput, &state, &L, all, &volume_ray, &volume_segment); @@ -517,7 +517,7 @@ ccl_device float4 kernel_branched_path_integrate(KernelGlobals *kg, RNG *rng, in #ifdef __EMISSION__ /* direct light */ if(kernel_data.integrator.use_direct_light) { - bool all = kernel_data.integrator.sample_all_lights_direct; + int all = kernel_data.integrator.sample_all_lights_direct; kernel_branched_path_surface_connect_light(kg, rng, &sd, &hit_state, throughput, 1.0f, &L, all); } |