Merge branch '1.2_maintenance' into 1.3_maintenance

Changes.md

@@ -5,6 +5,7 @@ Fixes
 -----
 
 - DisplayTransform : Fixed missing `view` presets when `display` is at the default value (#5392).
+- Arnold : Fixed translation of `vector` typed outputs defined as `vector <name>` in an output definition.
 
 1.3.0.0 (relative to 1.2.10.0)
 =======
@@ -222,6 +223,10 @@ Build
 1.2.10.x (relative to 1.2.10.0)
 ========
 
+Fixes
+-----
+
+- Arnold : Fixed translation of `vector` typed outputs defined as `vector <name>` in an output definition.
 
 1.2.10.0 (relative to 1.2.9.0)
 ========

python/GafferUITest/PlugValueWidgetTest.py

@@ -50,12 +50,14 @@ class PlugValueWidgetTest( GafferUITest.TestCase ) :
 	@staticmethod
 	def waitForUpdate( widget ) :
 
-		# Updates are done lazily, so we need to flush any pending updates.
-		widget._PlugValueWidget__callUpdateFromValues.flush( widget )
-		# And updates for computed values are done in the background, so we
-		# need to wait until they're done.
-		if any( isinstance( p, Gaffer.ValuePlug ) and Gaffer.PlugAlgo.dependsOnCompute( p ) for p in widget.getPlugs() ) :
-			with GafferTest.ParallelAlgoTest.UIThreadCallHandler() as handler :
+		with GafferTest.ParallelAlgoTest.UIThreadCallHandler() as handler :
+
+			# Updates are done lazily, so we need to flush any pending updates.
+			widget._PlugValueWidget__callUpdateFromValues.flush( widget )
+
+			# And updates for computed values are done in the background, so we
+			# need to wait until they're done.
+			if any( isinstance( p, Gaffer.ValuePlug ) and Gaffer.PlugAlgo.dependsOnCompute( p ) for p in widget.getPlugs() ) :
 				handler.assertCalled()
 
 	def testContext( self ) :

python/IECoreArnoldTest/RendererTest.py

@@ -680,6 +680,7 @@ def testOutputs( self ) :
 			( "C", "float" ),
 			( "D", "int" ),
 			( "E", "uint" ),
+			( "F", "vector" ),
 		] :
 
 			r.output(
@@ -703,6 +704,7 @@ def testOutputs( self ) :
 				"C FLOAT ieCoreArnold:filter:testC ieCoreArnold:display:testC",
 				"D INT ieCoreArnold:filter:testD ieCoreArnold:display:testD",
 				"E UINT ieCoreArnold:filter:testE ieCoreArnold:display:testE",
+				"F VECTOR ieCoreArnold:filter:testF ieCoreArnold:display:testF",
 			] ) )
 
 	def testOutputFilters( self ) :

src/IECoreArnold/Renderer.cpp

@@ -636,7 +636,7 @@ class ArnoldOutput : public IECore::RefCounted
 						m_data = m_lpeName;
 						m_type = colorType;
 					}
-					else if( tokens[0] == "float" || tokens[0] == "int" || tokens[0] == "uint" )
+					else if( tokens[0] == "float" || tokens[0] == "int" || tokens[0] == "uint" || tokens[0] == "vector" )
 					{
 						// Cortex convention is `<type> <name>`. Arnold
 						// convention is `<name> <TYPE>`.