diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-03-07 06:31:53 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-03-07 06:31:53 +0300 |
commit | 49baf15a35e89dc9ef945d584a0842d908bd040a (patch) | |
tree | 87bff2e6ec2febf742ac789125598110abacb84f /intern | |
parent | 4f23e130019bb5a41898df532365e97330ec258a (diff) | |
parent | 737a5efff4e7e77d1a163d6f4ba2736663145287 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern')
-rw-r--r-- | intern/cycles/kernel/kernel_shader.h | 6 | ||||
-rw-r--r-- | intern/cycles/kernel/split/kernel_indirect_subsurface.h | 13 |
2 files changed, 9 insertions, 10 deletions
diff --git a/intern/cycles/kernel/kernel_shader.h b/intern/cycles/kernel/kernel_shader.h index 8cfd33b808e..b1f66852b7f 100644 --- a/intern/cycles/kernel/kernel_shader.h +++ b/intern/cycles/kernel/kernel_shader.h @@ -994,8 +994,10 @@ ccl_device void shader_eval_surface(KernelGlobals *kg, ShaderData *sd, DiffuseBsdf *bsdf = (DiffuseBsdf*)bsdf_alloc(sd, sizeof(DiffuseBsdf), make_float3(0.8f, 0.8f, 0.8f)); - bsdf->N = sd->N; - sd->flag |= bsdf_diffuse_setup(bsdf); + if (bsdf != NULL) { + bsdf->N = sd->N; + sd->flag |= bsdf_diffuse_setup(bsdf); + } #endif } diff --git a/intern/cycles/kernel/split/kernel_indirect_subsurface.h b/intern/cycles/kernel/split/kernel_indirect_subsurface.h index b65f3d1a940..236c94e983c 100644 --- a/intern/cycles/kernel/split/kernel_indirect_subsurface.h +++ b/intern/cycles/kernel/split/kernel_indirect_subsurface.h @@ -38,7 +38,6 @@ ccl_device void kernel_indirect_subsurface(KernelGlobals *kg) 1); #ifdef __SUBSURFACE__ - if(ray_index == QUEUE_EMPTY_SLOT) { return; } @@ -57,17 +56,15 @@ ccl_device void kernel_indirect_subsurface(KernelGlobals *kg) */ if(ss_indirect->num_rays) { kernel_path_subsurface_setup_indirect(kg, - ss_indirect, - state, - ray, - L, - throughput); + ss_indirect, + state, + ray, + L, + throughput); ASSIGN_RAY_STATE(ray_state, ray_index, RAY_REGENERATED); } } - #endif /* __SUBSURFACE__ */ - } CCL_NAMESPACE_END |