diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2017-07-11 23:39:51 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2017-07-11 23:39:51 +0300 |
| commit | 29ec0b1162667124e0cd2610f087dcdb2296848d (patch) | |
| tree | eab9be21e3b29bcc4b5e55d9063aa4c8bed17523 /intern | |
| parent | 3f39719b5df592caa6bd1cd68da38377855b89cc (diff) | |
Fix T52027: OSL getattribute() crash, when optimizer calls it before rendering.
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/kernel/osl/osl_services.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/kernel/osl/osl_services.cpp b/intern/cycles/kernel/osl/osl_services.cpp index b767c60c617..1535496c73d 100644 --- a/intern/cycles/kernel/osl/osl_services.cpp +++ b/intern/cycles/kernel/osl/osl_services.cpp @@ -824,7 +824,7 @@ bool OSLRenderServices::get_background_attribute(KernelGlobals *kg, ShaderData * bool OSLRenderServices::get_attribute(OSL::ShaderGlobals *sg, bool derivatives, ustring object_name, TypeDesc type, ustring name, void *val) { - if(sg->renderstate == NULL) + if(sg == NULL || sg->renderstate == NULL) return false; ShaderData *sd = (ShaderData *)(sg->renderstate); |