[Backport 6000.5] Fix badge not correctly showing after graph validation.

Author: ncerone-unity

Packages/com.unity.shadergraph/Editor/Generation/Targets/UITK/UISubTarget.cs

@@ -223,18 +223,26 @@ public string GetValidatorKey()
 
         public INodeValidationExtension.Status GetValidationStatus(AbstractMaterialNode node, out string msg)
         {
-            // Make sure node is in our graph first
             if (node.owner == null)
             {
                 msg = null;
                 return INodeValidationExtension.Status.None;
             }
 
-            // Clear all Warning/Error message from other providers.
-            // The message from the graph (when loading the graph) will not be removed
-            // since it's not the same provider as the UISubTarget. It then stays present
-            // even if the UV0 is selected.
-            node.owner.messageManager.ClearNodeFromOtherProvider(this, new[] { node });
+            if (!IsIUISubTarget(node))
+            {
+                msg = null;
+                return INodeValidationExtension.Status.None;
+            }
+
+            if (!HasUVMaterialSlotOrIsUVNode(node))
+            {
+                msg = null;
+                return INodeValidationExtension.Status.None;
+            }
+
+            node.owner.messageManager.ClearNodesFromProvider(node.owner, new[] { node });
+            node.owner.messageManager.ClearNodesFromProvider(this, new[] { node });
 
             foreach (var item in node.owner.activeTargets)
             {
@@ -251,8 +259,53 @@ public INodeValidationExtension.Status GetValidationStatus(AbstractMaterialNode
             return INodeValidationExtension.Status.None;
         }
 
-        private bool ValidateUV(AbstractMaterialNode node, out string warningMessage)
+        static bool IsIUISubTarget(AbstractMaterialNode node)
         {
+            bool isIUISubTarget = false;
+            foreach (var target in node.owner.activeTargets)
+            {
+                var subTarget = target.activeSubTarget;
+                if (subTarget is IUISubTarget)
+                {
+                    isIUISubTarget = true;
+                    break;
+                }
+            }
+            return isIUISubTarget;
+        }
+
+        static bool HasUVMaterialSlotOrIsUVNode(AbstractMaterialNode node)
+        {
+            List<UVMaterialSlot> uvSlots = new();
+            node.GetInputSlots<UVMaterialSlot>(uvSlots);
+
+            if (uvSlots.Count > 0)
+            {
+                return true;
+            }
+
+            UVNode uvNode = node as UVNode;
+            if (uvNode != null)
+            {
+                return true;
+            }
+            return false;
+        }
+
+        static bool ValidateUV(AbstractMaterialNode node, out string warningMessage)
+        {
+            if (!IsIUISubTarget(node))
+            {
+                warningMessage = null;
+                return false;
+            }
+
+            if (!HasUVMaterialSlotOrIsUVNode(node))
+            {
+                warningMessage = null;
+                return false;
+            }
+
             List<UVMaterialSlot> uvSlots = new();
             node.GetInputSlots<UVMaterialSlot>(uvSlots);
 

Packages/com.unity.shadergraph/Editor/Util/MessageManager.cs

@@ -123,25 +123,6 @@ public void ClearNodesFromProvider(object messageProvider, IEnumerable<AbstractM
                 }
             }
         }
-
-        public void ClearNodeFromOtherProvider(object messageProvider, IEnumerable<AbstractMaterialNode> nodes)
-        {
-            foreach (var key in m_Messages.Keys)
-            {
-                if (key != messageProvider)
-                {
-                    foreach (var node in nodes)
-                    {
-                        if (m_Messages[key].TryGetValue(node.objectId, out var messages))
-                        {
-                            nodeMessagesChanged |= messages.Count > 0;
-                            messages.Clear();
-                        }
-                    }
-                }
-            }
-        }
-
         public void ClearAll()
         {
             m_Messages.Clear();

Packages/com.unity.shadergraph/Tests/Editor/UnitTests/MessageManagerTests.cs

@@ -320,27 +320,6 @@ public void ReportAnyErrors_EmptyManager_ErrorOneProvider()
             var ret = m_EmptyMgr.HasSeverity();
             Assert.IsTrue(ret);
         }
-
-        [Test]
-        public void ClearNodesFromOtherProvider()
-        {
-            m_ComplexMgr.ClearNodeFromOtherProvider(p0, new List<AbstractMaterialNode> { node1 });
-
-            // Verify node1 is still in provider0
-            Assert.IsTrue(m_ComplexMgr.Messages.ContainsKey(p0));
-            Assert.IsTrue(m_ComplexMgr.Messages[p0].ContainsKey(node1.objectId));
-            Assert.AreEqual(1, m_ComplexMgr.Messages[p0][node1.objectId].Count);
-            Assert.AreEqual(e2, m_ComplexMgr.Messages[p0][node1.objectId][0]);
-
-            // Verify node1 is cleared from provider1
-            Assert.IsTrue(m_ComplexMgr.Messages.ContainsKey(p1));
-            Assert.IsTrue(m_ComplexMgr.Messages[p1].ContainsKey(node1.objectId));
-            Assert.AreEqual(0, m_ComplexMgr.Messages[p1][node1.objectId].Count);
-
-            // Verify other nodes in provider1 are unchanged
-            Assert.AreEqual(1, m_ComplexMgr.Messages[p1][node0.objectId].Count);
-            Assert.AreEqual(1, m_ComplexMgr.Messages[p1][node2.objectId].Count);
-        }
     }
 }