fixup! AttributeQuery : Support inheriting global attributes

UI and test for ShaderQuery

Author: murraystevenson

Changes.md

@@ -7,7 +7,7 @@ Improvements
 - RenderMan : Added dedicated viewport visualisers for RenderMan lights.
 - LocaliseAttributes : Added support for localising global attributes, controlled by the new `includeGlobalAttributes` plug.
 - AttributeTweaks : Added support for localising global attributes when `localise` is enabled.
-- AttributeQuery : Added support for querying global attributes when `inherit` is enabled.
+- AttributeQuery, ShaderQuery : Added support for querying global attributes when `inherit` is enabled.
 
 API
 ---

python/GafferSceneTest/ShaderQueryTest.py

@@ -475,6 +475,73 @@ def testSerialisation( self ) :
 		self.assertIsNone( scriptNode["target"]["parameters"]["b1"].getInput() )
 		self.assertEqual( str( scriptNode["target"]["parameters"]["b2"].getInput() ), str( q["out"][1]["exists"] ) )
 
+	def testInheritedGlobalShader( self ) :
+
+		sphere = GafferScene.Sphere()
+
+		globalSurface = GafferSceneTest.TestShader( "surface" )
+		globalSurface["type"].setValue( "test:surface" )
+		globalSurface["parameters"]["i"].setValue( 2 )
+		globalSurface["parameters"]["c"].setValue( imath.Color3f( 0.3, 0.4, 0.5 ) )
+
+		globalAttributes = GafferScene.CustomAttributes()
+		globalAttributes["in"].setInput( sphere["out"] )
+		globalAttributes["global"].setValue( True )
+		globalAttributes["extraAttributes"].setValue( IECore.CompoundObject( { "test:surface" : globalSurface.attributes()["test:surface"] } ) )
+
+		surface = GafferSceneTest.TestShader( "surface" )
+		surface["type"].setValue( "test:surface" )
+		surface["parameters"]["i"].setValue( 3 )
+		surface["parameters"]["c"].setValue( imath.Color3f( 0.6, 0.7, 0.8 ) )
+
+		shaderAssignment = GafferScene.ShaderAssignment()
+		shaderAssignment["in"].setInput( globalAttributes["out"] )
+		shaderAssignment["shader"].setInput( surface["out"] )
+		shaderAssignment["enabled"].setValue( False )
+
+		query = GafferScene.ShaderQuery()
+		query["scene"].setInput( shaderAssignment["out"] )
+		query["location"].setValue( "/sphere" )
+		query["shader"].setValue( "test:surface" )
+
+		v1 = query.addQuery( Gaffer.IntPlug( "i", Gaffer.Plug.Direction.Out, 1 ), "i" )
+		v2 = query.addQuery( Gaffer.Color3fPlug( "c3f", Gaffer.Plug.Direction.Out, imath.Color3f( 0.1, 0.2, 0.3 ) ), "c" )
+
+		self.assertFalse( query["out"][0]["exists"].getValue() )
+		self.assertFalse( query["out"][1]["exists"].getValue() )
+
+		query["inherit"].setValue( True )
+
+		self.assertTrue( query["out"][0]["exists"].getValue() )
+		self.assertTrue( query["out"][1]["exists"].getValue() )
+
+		self.assertEqual( query["out"][0]["value"].getValue(), 2 )
+		self.assertEqual( query["out"][1]["value"].getValue(), imath.Color3f( 0.3, 0.4, 0.5 ) )
+
+		globalSurface["parameters"]["i"].setValue( 10 )
+		globalAttributes["extraAttributes"].setValue( IECore.CompoundObject( { "test:surface" : globalSurface.attributes()["test:surface"] } ) )
+
+		self.assertTrue( query["out"][0]["exists"].getValue() )
+		self.assertTrue( query["out"][1]["exists"].getValue() )
+
+		self.assertEqual( query["out"][0]["value"].getValue(), 10 )
+		self.assertEqual( query["out"][1]["value"].getValue(), imath.Color3f( 0.3, 0.4, 0.5 ) )
+
+		shaderAssignment["enabled"].setValue( True )
+
+		self.assertTrue( query["out"][0]["exists"].getValue() )
+		self.assertTrue( query["out"][1]["exists"].getValue() )
+
+		self.assertEqual( query["out"][0]["value"].getValue(), 3 )
+		self.assertEqual( query["out"][1]["value"].getValue(), imath.Color3f( 0.6, 0.7, 0.8 ) )
+
+		query["inherit"].setValue( False )
+
+		self.assertTrue( query["out"][0]["exists"].getValue() )
+		self.assertTrue( query["out"][1]["exists"].getValue() )
+
+		self.assertEqual( query["out"][0]["value"].getValue(), 3 )
+		self.assertEqual( query["out"][1]["value"].getValue(), imath.Color3f( 0.6, 0.7, 0.8 ) )
 
 if __name__ == "__main__":
 	unittest.main()

python/GafferSceneUI/ShaderQueryUI.py

@@ -402,7 +402,7 @@ def _shaderAttributes( plugValueWidget, paths, affectedOnly ) :
 		attributeNamePatterns = node["shader"].getValue() if affectedOnly else "*"
 
 		for path in paths :
-			attributes = node["scene"].fullAttributes( path ) if useFullAttr else node["scene"].attributes( path )
+			attributes = node["scene"].fullAttributes( path, withGlobalAttributes = True ) if useFullAttr else node["scene"].attributes( path )
 			for name, attribute in attributes.items() :
 				if not IECore.StringAlgo.matchMultiple( name, attributeNamePatterns ) :
 					continue