Merge pull request #4698 from johnhaddon/toolColorPlugFix

ColorSwatchPlugValueWidget : Fix dialogue for Tool plugs

Changes.md

@@ -17,6 +17,7 @@ Fixes
 
 - PlugLayout : Fixed visibility of collapsible layouts with nesting (#4694).
 - Image Node Mix : Fixed incorrect results outside mask data window, and incorrect results when changing inputs.
+- ColorSwatchPlugValueWidget : Fixed popup dialogue for plugs belonging to Tools.
 
 0.61.11.0 (relative to 0.61.10.0)
 =========

python/GafferUI/ColorSwatchPlugValueWidget.py

@@ -165,6 +165,14 @@ def acquire( cls, plugs ) :
 		plug = next( iter( plugs ) )
 
 		script = plug.node().scriptNode()
+		if script is None :
+			# Plug might be part of the UI rather than the node graph (e.g. a
+			# Tool or View setting). Find the script.
+			view = plug.ancestor( GafferUI.View )
+			if view is not None :
+				script = view["in"].getInput().node().scriptNode()
+
+		assert( script is not None )
 		scriptWindow = GafferUI.ScriptWindow.acquire( script )
 
 		for window in scriptWindow.childWindows() :