Fixed keywords and presets being applied incorrectly when editing mul…

…tiple materials
JasonMa0012 · Jan 8, 2025 · 8bed3ae · 8bed3ae
1 parent bcc01b0
commit 8bed3ae
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 11 deletions.
diff --git a/Editor/LWGUI.cs b/Editor/LWGUI.cs
@@ -195,7 +195,6 @@ public static void OnValidate(Object[] materials)
 		public static void OnValidate(LWGUIMetaDatas metaDatas)
 		{
 			OnValidate(metaDatas?.GetMaterialEditor()?.targets);
-			OnValidate(metaDatas?.GetMaterialEditor()?.targets);
 		}
 
 		// Called after edit or undo

diff --git a/Editor/ShaderDrawer.cs b/Editor/ShaderDrawer.cs
@@ -119,12 +119,15 @@ public override float GetPropertyHeight(MaterialProperty prop, string label, Mat
 			return _height;
 		}
 
-		// Call when creating new material, used to set keywords
+		// Call when create/edit/undo materials, used to set keywords and presets
 		public override void Apply(MaterialProperty prop)
 		{
 			base.Apply(prop);
-			Helper.SetShaderKeyWord(prop.targets, Helper.GetKeyWord(_keyword, prop.name), prop.floatValue > 0f);
-			PresetDrawer.ApplyPreset(_presetFileName, prop);
+			if (!prop.hasMixedValue)
+			{
+				Helper.SetShaderKeyWord(prop.targets, Helper.GetKeyWord(_keyword, prop.name), prop.floatValue > 0f);
+				PresetDrawer.ApplyPreset(_presetFileName, prop);
+			}
 		}
 	}
 
@@ -248,8 +251,11 @@ public override void DrawProp(Rect position, MaterialProperty prop, GUIContent l
 		public override void Apply(MaterialProperty prop)
 		{
 			base.Apply(prop);
-			Helper.SetShaderKeyWord(prop.targets, Helper.GetKeyWord(_keyWord, prop.name), prop.floatValue > 0f);
-			PresetDrawer.ApplyPreset(_presetFileName, prop);
+			if (!prop.hasMixedValue)
+			{
+				Helper.SetShaderKeyWord(prop.targets, Helper.GetKeyWord(_keyWord, prop.name), prop.floatValue > 0f);
+				PresetDrawer.ApplyPreset(_presetFileName, prop);
+			}
 		}
 	}
 
@@ -561,7 +567,10 @@ public override void DrawProp(Rect position, MaterialProperty prop, GUIContent l
 		public override void Apply(MaterialProperty prop)
 		{
 			base.Apply(prop);
-			Helper.SetShaderKeyWord(prop.targets, GetKeywords(prop), (int)prop.floatValue);
+			if (!prop.hasMixedValue)
+			{
+				Helper.SetShaderKeyWord(prop.targets, GetKeywords(prop), (int)prop.floatValue);
+			}
 		}
 	}
 
@@ -1236,7 +1245,10 @@ public override void DrawProp(Rect position, MaterialProperty prop, GUIContent l
 		public override void Apply(MaterialProperty prop)
 		{
 			base.Apply(prop);
-			ApplyPreset(presetFileName, prop);
+			if (!prop.hasMixedValue)
+			{
+				ApplyPreset(presetFileName, prop);
+			}
 		}
 	}
 
@@ -1579,8 +1591,11 @@ public override void DrawProp(Rect position, MaterialProperty prop, GUIContent l
 		public override void Apply(MaterialProperty prop)
 		{
 			base.Apply(prop);
-			if (ShowIfDecorator.GetShowIfResultToFilterDrawerApplying(prop))
-				Helper.SetShaderPassEnabled(prop.targets, _lightModeNames, prop.floatValue > 0);
+			if (!prop.hasMixedValue)
+			{
+				if (ShowIfDecorator.GetShowIfResultToFilterDrawerApplying(prop))
+					Helper.SetShaderPassEnabled(prop.targets, _lightModeNames, prop.floatValue > 0);
+			}
 		}
 	}
 

diff --git a/UnityEditorExtension/UnityEditorExtension.cs b/UnityEditorExtension/UnityEditorExtension.cs
@@ -18,6 +18,7 @@ public static void ApplyMaterialPropertyAndDecoratorDrawers(Material material)
 			ApplyMaterialPropertyAndDecoratorDrawers(objs);
 		}
 
+		// Called after edit or undo
 		public static void ApplyMaterialPropertyAndDecoratorDrawers(Object[] targets)
 		{
 			if (!EditorMaterialUtility.disableApplyMaterialPropertyDrawers)

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "com.jasonma.lwgui",
-  "version": "1.21.0",
+  "version": "1.21.1",
   "displayName": "LWGUI",
   "description": "A Lightweight, Flexible, Powerful Shader GUI System for Unity.",
   "keywords": [