Merge branch '1.2_maintenance' into 1.3_maintenance

Changes.md

@@ -323,6 +323,11 @@ Fixes
 - Arnold : Fixed screen window export for Lentil cameras.
 - Application : Fixed the `-threads` argument to clamp the number of threads to the number of available hardware cores (#5403).
 - CompareFloat, CompareColor, CompareVector : Worked around crashes in OSL's batched shading system (#5430).
+- GafferUI : Fixed TableView bug causing the horizontal scrollbar to potentially overlap the last row (#5328).
+- Viewer :
+  - Fixed visualisation of Cycles point light size.
+  - Fixed visualisation of Arnold light gobo textures with scaled UV coordinates.
+- Dispatch App : Fixed bug that prevented setting specific dispatcher plug values from the command line (#5434).
 
 1.2.10.1 (relative to 1.2.10.0)
 ========

apps/dispatch/dispatch-1.py

@@ -186,7 +186,10 @@ def _run( self, args ) :
 			return 1
 
 		if args["gui"].value and len(args["alternateDispatchers"]) :
-			dispatchers.extend( GafferDispatch.Dispatcher.createMatching( " ".join( args["alternateDispatchers"] ) ) )
+			pattern = " ".join( args[ "alternateDispatchers" ] )
+			for name in GafferDispatch.Dispatcher.registeredDispatchers() :
+				if name != dispatcherType and IECore.StringAlgo.matchMultiple( name, pattern ) :
+					dispatchers.append( GafferDispatch.Dispatcher.create( name ) )
 
 		dispatcherNames = {}
 		for dispatcher in dispatchers :

python/GafferUI/_TableView.py

@@ -92,6 +92,10 @@ def minimumSizeHint( self ) :
 
 		if not self.horizontalHeader().isHidden() :
 			minimumHeight += self.horizontalHeader().sizeHint().height()
+		# allow room for a visible horizontal scrollbar to prevent it overlapping
+		# the last row.
+		if self.horizontalScrollBarPolicy() != QtCore.Qt.ScrollBarAlwaysOff and not self.horizontalScrollBar().isHidden() :
+			minimumHeight += self.horizontalScrollBar().sizeHint().height()
 
 		numRows = self.verticalHeader().count()
 		if numRows :
@@ -124,6 +128,10 @@ def sizeHint( self ) :
 		h = self.verticalHeader().length() + margins.top() + margins.bottom()
 		if not self.horizontalHeader().isHidden() :
 			h += self.horizontalHeader().sizeHint().height()
+		# allow room for a visible horizontal scrollbar to prevent it overlapping
+		# the last row.
+		if self.horizontalScrollBarPolicy() != QtCore.Qt.ScrollBarAlwaysOff and not self.horizontalScrollBar().isHidden() :
+			h += self.horizontalScrollBar().sizeHint().height()
 
 		return QtCore.QSize( w, h )
 

src/GafferArnoldUI/GoboVisualiser.cpp

@@ -308,8 +308,8 @@ Visualisations GoboVisualiser::visualise( const IECore::InternedString &attribut
 	const float baseDistance = cos( halfAngle );
 
 	float rotate = parameterOrDefault( filterParameters, "rotate", 0.0f );
-	float scaleS = parameterOrDefault( filterParameters, "scale_s", 1.0f );
-	float scaleT = parameterOrDefault( filterParameters, "scale_t", 1.0f );
+	float scaleS = parameterOrDefault( filterParameters, "sscale", 1.0f );
+	float scaleT = parameterOrDefault( filterParameters, "tscale", 1.0f );
 	V2f offset = parameterOrDefault( filterParameters, "offset", V2f( 0.0f ) );
 
 	Imath::M44f goboTrans;

startup/GafferScene/cyclesLights.py

@@ -50,6 +50,7 @@
 Gaffer.Metadata.registerValue( "cycles:light:point_light", "intensityParameter", "intensity" )
 Gaffer.Metadata.registerValue( "cycles:light:point_light", "exposureParameter", "exposure" )
 Gaffer.Metadata.registerValue( "cycles:light:point_light", "colorParameter", "color" )
+Gaffer.Metadata.registerValue( "cycles:light:point_light", "radiusParameter", "size" )
 
 Gaffer.Metadata.registerValue( "cycles:light:distant_light", "type", "distant" )
 Gaffer.Metadata.registerValue( "cycles:light:distant_light", "intensityParameter", "intensity" )