Merge branch '1.2_maintenance' into 1.3_maintenance

Changes.md

@@ -12,6 +12,7 @@ Improvements
 Fixes
 -----
 
+- NameSwitch : Fixed bug which prevented drag and drop reordering of rows with an input connection.
 - PythonEditor :
   - Fixed output for `print()` calls with multiple arguments, which was previously spread across multiple lines.
   - Fixed bug that prevented editors being destroyed at the right time.
@@ -432,6 +433,12 @@ Build
 1.2.10.x (relative to 1.2.10.4)
 ========
 
+Fixes
+-----
+
+- NameSwitch : Fixed bug which prevented drag and drop reordering of rows with an input connection.
+- Scatter : Fixed loading of Scatter nodes saved from Gaffer 1.3+ (where the Seeds node was renamed to Scatter).
+
 1.2.10.4 (relative to 1.2.10.3)
 ========
 

python/GafferUI/NameSwitchUI.py

@@ -401,7 +401,9 @@ def _updateFromValues( self, values, exception ) :
 
 	def _updateFromEditable( self ) :
 
-		self.__dragHandle.setEnabled( self._editable() )
+		# Not using `_editable()` as it considers the whole plug to be non-editable if
+		# any child has an input connection, but that shouldn't prevent us reordering rows.
+		self.__dragHandle.setEnabled( not Gaffer.MetadataAlgo.readOnly( self.getPlug() ) )
 
 	def __updateWidgetVisibility( self ) :