From b12794270f680951b29fd2e8f5eff84c31c953d7 Mon Sep 17 00:00:00 2001 From: Misaki Date: Mon, 17 Mar 2025 23:19:48 +0900 Subject: [PATCH] FIxed the bug that properpty drawer does not work well on the version less than unity 6.1 --- Editor/PropertyDrawer/EnumFlagsDrawer.cs | 2 +- Editor/PropertyDrawer/PopupDrawer.cs | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Editor/PropertyDrawer/EnumFlagsDrawer.cs b/Editor/PropertyDrawer/EnumFlagsDrawer.cs index 0b53c49..c8bd94a 100644 --- a/Editor/PropertyDrawer/EnumFlagsDrawer.cs +++ b/Editor/PropertyDrawer/EnumFlagsDrawer.cs @@ -20,7 +20,7 @@ namespace Misaki.ShaderGUI #if UNITY_6000_1_OR_NEWER return prop.propertyType == ShaderPropertyType.Float || prop.propertyType == ShaderPropertyType.Range || prop.propertyType == ShaderPropertyType.Int; #else - return prop.type == MaterialProperty.PropType.Float || prop.type == MaterialProperty.PropType.Range || prop.type == MaterialProperty.PropType.Float; + return prop.type == MaterialProperty.PropType.Float || prop.type == MaterialProperty.PropType.Range || prop.type == MaterialProperty.PropType.Int; #endif } diff --git a/Editor/PropertyDrawer/PopupDrawer.cs b/Editor/PropertyDrawer/PopupDrawer.cs index 4695ada..a8b32ef 100644 --- a/Editor/PropertyDrawer/PopupDrawer.cs +++ b/Editor/PropertyDrawer/PopupDrawer.cs @@ -9,7 +9,7 @@ namespace Misaki.ShaderGUI { private static readonly GUIContent[] _options = { new("Disabled"), new("Enabled") }; - protected virtual void OnPropertyChange(MaterialProperty prop) + protected virtual void OnPropertyChanged(MaterialProperty prop) { } @@ -18,7 +18,7 @@ namespace Misaki.ShaderGUI #if UNITY_6000_1_OR_NEWER return prop.propertyType == ShaderPropertyType.Float || prop.propertyType == ShaderPropertyType.Range || prop.propertyType == ShaderPropertyType.Int; #else - return prop.type == MaterialProperty.PropType.Float || prop.type == MaterialProperty.PropType.Range || prop.type == MaterialProperty.PropType.Float; + return prop.type == MaterialProperty.PropType.Float || prop.type == MaterialProperty.PropType.Range || prop.type == MaterialProperty.PropType.Int; #endif } @@ -48,7 +48,7 @@ namespace Misaki.ShaderGUI if (EditorGUI.EndChangeCheck()) { prop.floatValue = value; - OnPropertyChange(prop); + OnPropertyChanged(prop); } } else @@ -62,7 +62,7 @@ namespace Misaki.ShaderGUI if (EditorGUI.EndChangeCheck()) { prop.intValue = value; - OnPropertyChange(prop); + OnPropertyChanged(prop); } } @@ -74,7 +74,7 @@ namespace Misaki.ShaderGUI { private const string Keyword_Suffix = "_ON"; - protected override void OnPropertyChange(MaterialProperty prop) + protected override void OnPropertyChanged(MaterialProperty prop) { var keywordName = prop.name.ToUpper() + Keyword_Suffix; foreach (var target in prop.targets) @@ -109,7 +109,7 @@ namespace Misaki.ShaderGUI _passName = passName; } - protected override void OnPropertyChange(MaterialProperty prop) + protected override void OnPropertyChanged(MaterialProperty prop) { foreach (var target in prop.targets) {