Tweaks UIs : Fix editability bug

murraystevenson · Feb 24, 2023 · 7f7e265 · 7f7e265
1 parent 121b3cc
commit 7f7e265
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 5 deletions.
diff --git a/Changes.md b/Changes.md
@@ -1,3 +1,11 @@
+1.1.9.x (relative to 1.1.9.1)
+=======
+
+Fixes
+-----
+
+- Tweak nodes : Fixed bugs which prevented the creation of new tweaks when an existing tweak had an input connection.
+
 1.1.9.1 (relative to 1.1.9.0)
 =======
 

diff --git a/python/GafferSceneUI/AttributeTweaksUI.py b/python/GafferSceneUI/AttributeTweaksUI.py
@@ -183,7 +183,10 @@ def __init__( self, plug ) :
 
 	def _updateFromPlug( self ) :
 
-		self.__button.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 adding a new
+		# tweak.
+		self.__button.setEnabled( self.getPlug().getInput() is None and not Gaffer.MetadataAlgo.readOnly( self.getPlug() ) )
 
 	def __menuDefinition( self ) :
 

diff --git a/python/GafferSceneUI/CameraTweaksUI.py b/python/GafferSceneUI/CameraTweaksUI.py
@@ -184,7 +184,10 @@ def __init__( self, plug ) :
 
 	def _updateFromPlug( self ) :
 
-		self.__button.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 adding a new
+		# tweak.
+		self.__button.setEnabled( self.getPlug().getInput() is None and not Gaffer.MetadataAlgo.readOnly( self.getPlug() ) )
 
 	def __menuDefinition( self ) :
 

diff --git a/python/GafferSceneUI/OptionTweaksUI.py b/python/GafferSceneUI/OptionTweaksUI.py
@@ -143,7 +143,10 @@ def __init__( self, plug ) :
 
 	def _updateFromPlug( self ) :
 
-		self.__button.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 adding a new
+		# tweak.
+		self.__button.setEnabled( self.getPlug().getInput() is None and not Gaffer.MetadataAlgo.readOnly( self.getPlug() ) )
 
 	def __menuDefinition( self ) :
 

diff --git a/python/GafferSceneUI/ShaderTweaksUI.py b/python/GafferSceneUI/ShaderTweaksUI.py
@@ -234,7 +234,10 @@ def __init__( self, plug ) :
 
 	def _updateFromPlug( self ) :
 
-		self.__button.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 adding a new
+		# tweak.
+		self.__button.setEnabled( self.getPlug().getInput() is None and not Gaffer.MetadataAlgo.readOnly( self.getPlug() ) )
 
 	def __menuDefinition( self ) :
 

diff --git a/python/GafferUI/ContextVariableTweaksUI.py b/python/GafferUI/ContextVariableTweaksUI.py
@@ -121,7 +121,10 @@ def __init__( self, plug ) :
 
 	def _updateFromPlug( self ) :
 
-		self.__button.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 adding a new
+		# tweak.
+		self.__button.setEnabled( self.getPlug().getInput() is None and not Gaffer.MetadataAlgo.readOnly( self.getPlug() ) )
 
 	def __menuDefinition( self ) :