[Bf-blender-cvs] [29ec0b11626] master: Fix T52027: OSL getattribute() crash, when optimizer calls it before rendering.

[Brecht Van Lommel]

Commit: 29ec0b1162667124e0cd2610f087dcdb2296848d
Author: Brecht Van Lommel
Date:   Tue Jul 11 22:39:51 2017 +0200
Branches: master
https://developer.blender.org/rB29ec0b1162667124e0cd2610f087dcdb2296848d

Fix T52027: OSL getattribute() crash, when optimizer calls it before rendering.

===================================================================

M	intern/cycles/kernel/osl/osl_services.cpp

===================================================================

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);