Merge branch 'master' into blender2.8

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