From dbf8ae00f50470912d458fda853a34ef94d7d533 Mon Sep 17 00:00:00 2001 From: mob-sakai <12690315+mob-sakai@users.noreply.github.com> Date: Wed, 22 Jul 2026 15:14:17 +0900 Subject: [PATCH] fix: infinite asset import loop caused by unchanged ProjectSettings being marked dirty close #404 --- .../Utilities/ShaderVariantRegistry.cs | 23 +++++++++++-------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/Packages/src/Runtime/Internal/Utilities/ShaderVariantRegistry.cs b/Packages/src/Runtime/Internal/Utilities/ShaderVariantRegistry.cs index a35e68d..f51d4d6 100644 --- a/Packages/src/Runtime/Internal/Utilities/ShaderVariantRegistry.cs +++ b/Packages/src/Runtime/Internal/Utilities/ShaderVariantRegistry.cs @@ -279,18 +279,23 @@ namespace Coffee.UIEffectInternal if (m_Asset == null) return; var so = new SerializedObject(m_Asset); var shaders = so.FindProperty("m_Shaders"); - m_RegisteredShaders.Clear(); - for (var i = 0; i < shaders.arraySize; i++) + + // Get all shaders in the SVC, ignoring nulls and duplicates. + var shadersInSVC = Enumerable.Range(0, shaders.arraySize) + .Select(i => + shaders.GetArrayElementAtIndex(i).FindPropertyRelative("first").objectReferenceValue as Shader) + .Where(s => s != null) + .Distinct() + .ToList(); + + // If the registered shaders are already in sync with the SVC, no need to update. + if (m_RegisteredShaders.SequenceEqual(shadersInSVC)) { - var shaderRef = shaders.GetArrayElementAtIndex(i) - .FindPropertyRelative("first") - .objectReferenceValue as Shader; - if (shaderRef != null && !m_RegisteredShaders.Contains(shaderRef)) - { - m_RegisteredShaders.Add(shaderRef); - } + return; } + m_RegisteredShaders.Clear(); + m_RegisteredShaders.AddRange(shadersInSVC); EditorUtility.SetDirty(owner); }