Fixed crash in ShaderStateComponent::addParametersToShaderSetup().

johnhaddon · johnhaddon · commit bb94632b927d · 2014-11-21T10:45:24.000Z
diff --git a/src/IECoreGL/ShaderStateComponent.cpp b/src/IECoreGL/ShaderStateComponent.cpp
@@ -92,6 +92,10 @@ class ShaderStateComponent::Implementation : public IECore::RefCounted
 
 		void addParametersToShaderSetup( Shader::Setup *shaderSetup ) const
 		{
+			if( !m_parameterMap )
+			{
+				return;
+			}
 			const IECore::CompoundObject::ObjectMap &d = m_parameterMap->members();
 			for( IECore::CompoundObject::ObjectMap::const_iterator it = d.begin(), eIt = d.end(); it != eIt; it++ )
 			{

Original file line number	Diff line number	Diff line change
`@@ -92,6 +92,10 @@ class ShaderStateComponent::Implementation : public IECore::RefCounted`
`92`	`92`
`93`	`93`	`void addParametersToShaderSetup( Shader::Setup *shaderSetup ) const`
`94`	`94`	`{`
	`95`	`+ if( !m_parameterMap )`
	`96`	`+ {`
	`97`	`+ return;`
	`98`	`+ }`
`95`	`99`	`const IECore::CompoundObject::ObjectMap &d = m_parameterMap->members();`
`96`	`100`	`for( IECore::CompoundObject::ObjectMap::const_iterator it = d.begin(), eIt = d.end(); it != eIt; it++ )`
`97`	`101`	`{`