Merge pull request GafferHQ#5476 from ericmehl/shaderBrowserFix

ShaderUI : Fix missing identical shaders
johnhaddon · Sep 27, 2023 · 94b87ec · 94b87ec
2 parents dd9ef43 + 0eba67d
commit 94b87ec
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/Changes.md b/Changes.md
@@ -7,6 +7,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)
 ========

diff --git a/python/GafferSceneUI/ShaderUI.py b/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 )