Merge pull request #5655 from johnhaddon/shaderViewContextFix

ShaderView : Scope correct context when computing shader
GafferHQ · Feb 2, 2024 · 56f7513 · 56f7513
2 parents 76c7350 + 64f0efd
commit 56f7513
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/Changes.md b/Changes.md
@@ -1,7 +1,10 @@
 1.3.x.x (relative to 1.3.11.0)
 =======
 
+Fixes
+-----
 
+- Viewer : Fixed context handling bug in the shader view (#5654).
 
 1.3.11.0 (relative to 1.3.10.0)
 ========

diff --git a/src/GafferSceneUI/ShaderView.cpp b/src/GafferSceneUI/ShaderView.cpp
@@ -201,7 +201,11 @@ const GafferImage::Display *ShaderView::display() const
 
 std::string ShaderView::shaderPrefix() const
 {
-	IECore::ConstCompoundObjectPtr attributes = inPlug<ShaderPlug>()->attributes();
+	IECore::ConstCompoundObjectPtr attributes;
+	{
+		Context::Scope scope( getContext() );
+		attributes = inPlug<ShaderPlug>()->attributes();
+	}
 	const char *shaders[] = { "surface", "displacement", "shader", nullptr };
 	for( IECore::CompoundObject::ObjectMap::const_iterator it = attributes->members().begin(), eIt = attributes->members().end(); it != eIt; ++it )
 	{