Merge branch '1.2_maintenance' into 1.3_maintenance

Changes.md

@@ -16,6 +16,7 @@ Fixes
 - GraphEditor : Removed dynamic raster-space sizing of focus icon, as it caused excessive overlap with other nodes at certain zoom levels and on certain high resolution displays (#5435).
 - StringPlugValueWidget : Fixed bug handling <kbd>Esc</kbd>.
 - Arnold : Fixed unnecessary `opaque` attribute deprecation warnings. These are now only emitted in the case that `opaque` has been explicitly turned off.
+- ShaderUI : Fixed bug causing identical but independent shaders in a shader network from being included in the shader browser.
 
 API
 ---
@@ -406,6 +407,7 @@ Fixes
 - GraphEditor : Removed dynamic raster-space sizing of focus icon, as it caused excessive overlap with other nodes at certain zoom levels and on certain high resolution displays (#5435).
 - StringPlugValueWidget : Fixed bug handling <kbd>Esc</kbd>.
 - Arnold : Fixed unnecessary `opaque` attribute deprecation warnings. These are now only emitted in the case that `opaque` has been explicitly turned off.
+- ShaderUI : Fixed bug causing identical but independent shaders in a shader network from being included in the shader browser.
 
 1.2.10.3 (relative to 1.2.10.2)
 ========

python/GafferSceneUI/ShaderUI.py

@@ -549,7 +549,7 @@ def _children( self, canceller ) :
 				shaderNetwork, shaderHandle = stack.popleft()
 				shader = shaderNetwork.shaders()[shaderHandle]
 
-				h = shaderNetwork.hash().append( shader.hash() )
+				h = shaderNetwork.hash().append( shaderHandle )
 
 				if h not in visited :
 					visited.add( h )