Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix T50937: baking with OpenCL and CPU have slightly different brightness

Browse Source 
OpenCL baking with SSS and Volume are not supported.
This commit is contained in:
Hristo Gueorguiev
2017-05-16 12:15:11 +02:00
parent 24676b535a
commit 40e6f65ea1
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
intern/cycles/kernel/kernel_path.h
View File

@@ -407,7 +407,7 @@ ccl_device void kernel_path_indirect(KernelGlobals *kg,
} }
#endif /* __SUBSURFACE__ */ #endif /* __SUBSURFACE__ */
#if defined(__EMISSION__) && defined(__BRANCHED_PATH__) #if defined(__EMISSION__)
if(kernel_data.integrator.use_direct_light) { if(kernel_data.integrator.use_direct_light) {
int all = (kernel_data.integrator.sample_all_lights_indirect) || int all = (kernel_data.integrator.sample_all_lights_indirect) ||
(state->flag & PATH_RAY_SHADOW_CATCHER); (state->flag & PATH_RAY_SHADOW_CATCHER);
@@ -421,7 +421,7 @@ ccl_device void kernel_path_indirect(KernelGlobals *kg,
L, L,
all); all);
} }
#endif /* defined(__EMISSION__) && defined(__BRANCHED_PATH__) */ #endif /* defined(__EMISSION__) */
if(!kernel_path_surface_bounce(kg, rng, sd, &throughput, state, L, ray)) if(!kernel_path_surface_bounce(kg, rng, sd, &throughput, state, L, ray))
break; break;

2
intern/cycles/kernel/kernel_path_surface.h
View File

@@ -16,7 +16,7 @@
CCL_NAMESPACE_BEGIN CCL_NAMESPACE_BEGIN
#if defined(__BRANCHED_PATH__) || defined(__SUBSURFACE__) || defined(__SHADOW_TRICKS__) #if defined(__BRANCHED_PATH__) || defined(__SUBSURFACE__) || defined(__SHADOW_TRICKS__) || defined(__BAKING__)
/* branched path tracing: connect path directly to position on one or more lights and add it to L */ /* branched path tracing: connect path directly to position on one or more lights and add it to L */
ccl_device_noinline void kernel_branched_path_surface_connect_light( ccl_device_noinline void kernel_branched_path_surface_connect_light(
KernelGlobals *kg, KernelGlobals *kg,