Merge branch 'dev' into 1.x

JasonMa0012 · JasonMa0012 · commit 7a7542635f02 · 2026-03-17T00:59:15.000+08:00
diff --git a/Editor/Helper/Helper.cs b/Editor/Helper/Helper.cs
@@ -60,6 +60,9 @@ public static void SelectShaderKeyword(Object[] materials, string[] keywordNames
 			{
 				SetShaderKeywordEnabled(materials, keywordNames[i], index == i);
 			}
+			
+			// Force set the currently selected Keyword
+			SetShaderKeywordEnabled(materials, keywordNames[index], true);
 		}
 
 		public static void SetShaderPassEnabled(Object[] materials, string[] lightModeNames, bool enabled)

Original file line number	Diff line number	Diff line change
`@@ -60,6 +60,9 @@ public static void SelectShaderKeyword(Object[] materials, string[] keywordNames`
`60`	`60`	`{`
`61`	`61`	`SetShaderKeywordEnabled(materials, keywordNames[i], index == i);`
`62`	`62`	`}`
	`63`	`+`
	`64`	`+ // Force set the currently selected Keyword`
	`65`	`+ SetShaderKeywordEnabled(materials, keywordNames[index], true);`
`63`	`66`	`}`
`64`	`67`
`65`	`68`	`public static void SetShaderPassEnabled(Object[] materials, string[] lightModeNames, bool enabled)`