Merge branch 'dev' of https://github.com/JasonMa0012/LWGUI

JasonMa0012 · Sep 26, 2022 · 05ecaa4 · 05ecaa4
2 parents 27c89dc + 52c10c5
commit 05ecaa4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Editor/ShaderDrawer.cs b/Editor/ShaderDrawer.cs
@@ -460,12 +460,13 @@ public override void DrawProp(Rect position, MaterialProperty prop, GUIContent l
 		{
 			EditorGUI.showMixedValue = prop.hasMixedValue;
 			var rect = position; //EditorGUILayout.GetControlRect();
-			var texLabel = string.Empty;
+			var texLabel = prop.displayName;
 
 			MaterialProperty extraProp = LWGUI.FindProp(_extraPropName, props, true);
 			if (extraProp != null && extraProp.type != MaterialProperty.PropType.Texture)
 			{
 				var i = EditorGUI.indentLevel;
+				texLabel = string.Empty;
 				Rect indentedRect, extraPropRect = new Rect(rect);
 				switch (extraProp.type)
 				{
@@ -484,7 +485,6 @@ public override void DrawProp(Rect position, MaterialProperty prop, GUIContent l
 						break;
 					case MaterialProperty.PropType.Range:
 						texLabel = prop.displayName;
-						label.text = string.Empty;
 						indentedRect = EditorGUI.IndentedRect(extraPropRect);
 						editor.SetDefaultGUIWidths();
 						EditorGUIUtility.fieldWidth += 1f;

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