diff options
| author | Hristo Gueorguiev <prem.nirved@gmail.com> | 2017-05-16 13:15:11 +0300 |
|---|---|---|
| committer | Hristo Gueorguiev <prem.nirved@gmail.com> | 2017-05-17 13:24:16 +0300 |
| commit | 40e6f65ea12ae031c06f7b24c6868c71845f899c (patch) | |
| tree | ab94fc38cf725a14082f46df13886bfa7cbc0e80 /intern/cycles/kernel/kernel_path.h | |
| parent | 24676b535af5fe3feede0cb42838f8eb7b00e92c (diff) | |
Fix T50937: baking with OpenCL and CPU have slightly different brightness
OpenCL baking with SSS and Volume are not supported.
Diffstat (limited to 'intern/cycles/kernel/kernel_path.h')
| -rw-r--r-- | intern/cycles/kernel/kernel_path.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/kernel/kernel_path.h b/intern/cycles/kernel/kernel_path.h index 0d31ae32aa6..fc093ad8319 100644 --- a/intern/cycles/kernel/kernel_path.h +++ b/intern/cycles/kernel/kernel_path.h @@ -407,7 +407,7 @@ ccl_device void kernel_path_indirect(KernelGlobals *kg, } #endif /* __SUBSURFACE__ */ -#if defined(__EMISSION__) && defined(__BRANCHED_PATH__) +#if defined(__EMISSION__) if(kernel_data.integrator.use_direct_light) { int all = (kernel_data.integrator.sample_all_lights_indirect) || (state->flag & PATH_RAY_SHADOW_CATCHER); @@ -421,7 +421,7 @@ ccl_device void kernel_path_indirect(KernelGlobals *kg, L, all); } -#endif /* defined(__EMISSION__) && defined(__BRANCHED_PATH__) */ +#endif /* defined(__EMISSION__) */ if(!kernel_path_surface_bounce(kg, rng, sd, &throughput, state, L, ray)) break; |