Merge branch '1.6_maintenance'

Author: murraystevenson

Changes.md

@@ -13,9 +13,12 @@ Fixes
 - MenuButton : Fixed immediate mode when the menu contained a single submenu.
 - RandomChoice : Fixed "Value/Weight" table headers when first setting up the node.
 - VectorDataPlugValueWidget : Fixed handling of custom header metadata when adding and removing columns.
-- RenderMan : Fixed handling of `treatAsPoint` and `treatAsLine` UsdLuxLight parameters. These are now ignored, matching the behaviour of `hdPrman`.
+- RenderMan :
+  - Fixed handling of `treatAsPoint` and `treatAsLine` UsdLuxLight parameters. These are now ignored, matching the behaviour of `hdPrman`.
+  - Fixed handling of connections between floats and color/vector components [^2].
 
 [^1]: Improvement to a feature introduced in `1.7.0.0a1`, so should be omitted from final `1.7.0.0` release notes.
+[^2]: Included in `1.6.x.x`, so should be omitted from final `1.7.0.0` release notes.
 
 1.7.0.0a9 (relative to 1.7.0.0a8)
 =========
@@ -438,7 +441,10 @@ Build
 1.6.x.x (relative to 1.6.21.2)
 =======
 
+Fixes
+-----
 
+- RenderMan : Fixed handling of connections between floats and color/vector components.
 
 1.6.21.2 (relative to 1.6.21.1)
 ========

python/IECoreRenderManTest/RendererTest.py

@@ -1079,6 +1079,48 @@ def testConnectionToMissingShader( self ) :
 
 		del renderer
 
+	def testComponentConnections( self ) :
+
+		renderer = GafferScene.Private.IECoreScenePreview.Renderer.create(
+			self.renderer,
+			GafferScene.Private.IECoreScenePreview.Renderer.RenderType.Batch
+		)
+
+		fileName = str( self.temporaryDirectory() / "test.exr" )
+		renderer.output(
+			"test",
+			IECoreScene.Output(
+				fileName,
+				"exr",
+				"rgba",
+				{
+				},
+			)
+		)
+
+		renderer.object(
+			"sphere",
+			IECoreScene.SpherePrimitive(),
+			renderer.attributes( IECore.CompoundObject( {
+				"ri:surface" : IECoreScene.ShaderNetwork(
+					shaders = {
+						"attribute" : IECoreScene.Shader( "PxrAttribute", "osl:shader", { "defaultFloat" : 0.5 } ),
+						"output" : IECoreScene.Shader( "PxrConstant", "ri:surface", { "emitColor" : imath.Color3f( 0.25, 1, 0.75 ) } ),
+					},
+					connections = [
+						( ( "attribute", "resultRGB.r" ), ( "output", "emitColor.g" ) ),
+					],
+					output = "output",
+				),
+			} ) )
+		).transform( imath.M44f().translate( imath.V3f( 0, 0, -3 ) ) )
+
+		renderer.render()
+		del renderer
+
+		image = OpenImageIO.ImageBuf( fileName )
+		self.assertEqual( image.getpixel( 320, 240, 0 ), ( 0.25, 0.5, 0.75, 1.0 ) )
+
 	def testConnectionToOSLShader( self ) :
 
 		renderer = GafferScene.Private.IECoreScenePreview.Renderer.create(

src/IECoreRenderMan/ShaderNetworkAlgo.cpp

@@ -887,6 +887,7 @@ ShaderNetworkPtr preprocessedNetwork( const IECoreScene::ShaderNetwork *shaderNe
 	IECoreScene::ShaderNetworkAlgo::expandRamps( result.get() );
 	IECoreRenderMan::ShaderNetworkAlgo::convertUSDShaders( result.get() );
 	IECoreRenderMan::ShaderNetworkAlgo::resolveVStructs( result.get() );
+	IECoreScene::ShaderNetworkAlgo::addComponentConnectionAdapters( result.get() );
 
 	return result;
 }