fix revert button in Advanced()

Editor/LWGUI.cs

@@ -97,8 +97,8 @@ public override void OnGUI(MaterialEditor materialEditor, MaterialProperty[] pro
 						var rect = EditorGUILayout.GetControlRect();
 						var revertButtonRect = RevertableHelper.SplitRevertButtonRect(ref rect);
 						var label = string.IsNullOrEmpty(propStaticData.advancedHeaderString) ? "Advanced" : propStaticData.advancedHeaderString;
-						RevertableHelper.DrawRevertableProperty(revertButtonRect, prop, this);
 						propStaticData.isExpanding = EditorGUI.Foldout(rect, propStaticData.isExpanding, label);
+						RevertableHelper.DrawRevertableProperty(revertButtonRect, prop, this, true);
 
 						if (!propStaticData.isExpanding)
 						{
@@ -161,9 +161,9 @@ private void DrawProperty(MaterialProperty prop)
 			Helper.BeginProperty(rect, prop, this);
 			Helper.DoPropertyContextMenus(rect, prop, this);
 			RevertableHelper.FixGUIWidthMismatch(prop.type, materialEditor);
-			RevertableHelper.DrawRevertableProperty(revertButtonRect, prop, this);
 			if (propStaticData.isAdvancedHeaderProperty)
 				propStaticData.isExpanding = EditorGUI.Foldout(rect, propStaticData.isExpanding, string.Empty);
+			RevertableHelper.DrawRevertableProperty(revertButtonRect, prop, this, propStaticData.isMain || propStaticData.isAdvancedHeaderProperty);
 			materialEditor.ShaderProperty(rect, prop, label);
 			Helper.EndProperty(this, prop);
 		}

Editor/MetaDataHelper.cs

@@ -173,6 +173,7 @@ public void BuildPropertyStaticData(Shader shader, MaterialProperty[] props)
 			// Build Display Mode Data
 			{
 				PropertyStaticData lastPropData = null;
+				PropertyStaticData lastHeaderPropData = null;
 				for (int i = 0; i < props.Length; i++)
 				{
 					var prop = props[i];
@@ -201,12 +202,15 @@ public void BuildPropertyStaticData(Shader shader, MaterialProperty[] props)
 							&& propStaticData.advancedHeaderString != lastPropData.advancedHeaderString))
 						{
 							propStaticData.isAdvancedHeader = true;
+							lastHeaderPropData = propStaticData;
 						}
 						// Else set to child
 						else
 						{
-							propStaticData.parent = lastPropData.isAdvancedHeader ? lastPropData : lastPropData.parent;
+							propStaticData.parent = lastHeaderPropData;
+							lastHeaderPropData.children.Add(propStaticData);
 						}
+
 					}
 
 					lastPropData = propStaticData;
@@ -338,6 +342,7 @@ public class PropertyDynamicData
 		public MaterialProperty defualtProperty;                        // Default values may be overridden by Preset
 		public string           defaultValueDescription = string.Empty; // Description of the default values used in Tooltip
 		public bool             hasModified             = false;        // Are properties modified in the material?
+		public bool             hasChildrenModified     = false;        // Are Children properties modified in the material?
 		public bool             hasRevertChanged        = false;        // Used to call property EndChangeCheck()
 		public bool             isShowing               = true;			// ShowIf() result
 
@@ -428,9 +433,9 @@ public void BuildPerFrameData(Shader shader, Material material, MaterialProperty
 					var parentPropData = propStaticData.parent;
 					if (parentPropData != null)
 					{
-						propertyDatas[parentPropData.name].hasModified = true;
+						propertyDatas[parentPropData.name].hasChildrenModified = true;
 						if (parentPropData.parent != null)
-							propertyDatas[parentPropData.parent.name].hasModified = true;
+							propertyDatas[parentPropData.parent.name].hasChildrenModified = true;
 					}
 				}
 

Editor/RevertableHelper.cs

@@ -117,7 +117,7 @@ public static string GetPropertyDefaultValueText(MaterialProperty defaultProp)
 
 		#region Draw revert button
 
-		public static bool DrawRevertableProperty(Rect position, MaterialProperty prop, LWGUI lwgui)
+		public static bool DrawRevertableProperty(Rect position, MaterialProperty prop, LWGUI lwgui, bool isHeader = false)
 		{
 			bool hasModified = prop.hasMixedValue;
 
@@ -126,6 +126,9 @@ public static bool DrawRevertableProperty(Rect position, MaterialProperty prop,
 			if (!hasModified)
 				hasModified = propDynamicData.hasModified;
 
+			if (!hasModified && isHeader)
+				hasModified = propDynamicData.hasChildrenModified;
+
 			var extraPropNames = lwgui.perShaderData.propertyDatas[prop.name].extraPropNames;
 			if (!hasModified && extraPropNames.Count > 0)
 				hasModified = extraPropNames.Any((extraPropName => lwgui.perFrameData.propertyDatas[extraPropName].hasModified));

package.json

@@ -1,6 +1,6 @@
 {
   "name": "com.jasonma.lwgui",
-  "version": "1.13.1",
+  "version": "1.13.2",
   "displayName": "LWGUI",
   "description": "A Lightweight, Flexible, Powerful Shader GUI System for Unity.",
   "keywords": [