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.h | |
| parent | 1d15421af97980e4a149490fe31a325fed070853 (diff) | |
Workaround for T47213: branched path sampling issues with CUDA 7.5.
Diffstat (limited to 'intern/cycles/kernel/kernel_path.h')
| -rw-r--r-- | intern/cycles/kernel/kernel_path.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/intern/cycles/kernel/kernel_path.h b/intern/cycles/kernel/kernel_path.h index 650e3b047f0..732c6e2fc21 100644 --- a/intern/cycles/kernel/kernel_path.h +++ b/intern/cycles/kernel/kernel_path.h @@ -141,7 +141,7 @@ ccl_device void kernel_path_indirect(KernelGlobals *kg, VolumeIntegrateResult result = VOLUME_PATH_ATTENUATED; if(volume_segment.closure_flag & SD_SCATTER) { - bool all = kernel_data.integrator.sample_all_lights_indirect; + int all = kernel_data.integrator.sample_all_lights_indirect; /* direct light sampling */ kernel_branched_path_volume_connect_light(kg, @@ -374,7 +374,7 @@ ccl_device void kernel_path_indirect(KernelGlobals *kg, #if defined(__EMISSION__) && defined(__BRANCHED_PATH__) if(kernel_data.integrator.use_direct_light) { - bool all = kernel_data.integrator.sample_all_lights_indirect; + int all = kernel_data.integrator.sample_all_lights_indirect; kernel_branched_path_surface_connect_light(kg, rng, &sd, @@ -705,7 +705,7 @@ ccl_device_inline float4 kernel_path_integrate(KernelGlobals *kg, VolumeIntegrateResult result = VOLUME_PATH_ATTENUATED; if(volume_segment.closure_flag & SD_SCATTER) { - bool all = false; + int all = false; /* direct light sampling */ kernel_branched_path_volume_connect_light(kg, rng, &volume_sd, |