From 0eba67dd99a4e50bb9a0d6eb091f6e87052ef3a4 Mon Sep 17 00:00:00 2001 From: Eric Mehl Date: Mon, 25 Sep 2023 17:54:34 -0400 Subject: [PATCH] ShaderUI : Fix missing identical shaders Fixes #5472 --- Changes.md | 1 + python/GafferSceneUI/ShaderUI.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Changes.md b/Changes.md index 1425ac0f80f..7d554656f43 100644 --- 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 Esc. - 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 index 38799b5bd33..ac22248b6f0 100644 --- 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 )