Commit: 76122bc8f00bed619a350dbb6a825252fbbb8f91
Author: Sergey Sharybin
Date: Tue Mar 6 12:00:51 2018 +0100
Branches: master
https://developer.blender.org/rB76122bc8f00bed619a350dbb6a825252fbbb8f91
Cycles: Fix crash when building with no shading systems
===================================================================
M intern/cycles/kernel/kernel_shader.h
===================================================================
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
}
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
