I am not smart

risk-of-thunder · Sep 7, 2024 · 36e089f · 36e089f
1 parent 1e6a3bf
commit 36e089f
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+### '5.0.4'
+
+* Core Changes:
+ * ``SerializableShaderWrapperDrawer`` now uses ``nameof`` to avoid not finding the correct properties.
+
 ### '5.0.3'
 
 * Core Changes:

diff --git a/Editor/Core/PropertyDrawers/SerializableShaderWrapperDrawer.cs b/Editor/Core/PropertyDrawers/SerializableShaderWrapperDrawer.cs
@@ -9,8 +9,8 @@ internal class SerializableShaderWrapperDrawer : IMGUIPropertyDrawer<Serializabl
  Object shaderObj = null;
  protected override void DrawIMGUI(Rect position, SerializedProperty property, GUIContent label)
  {
- var shaderNameProp = property.FindPropertyRelative("_shaderName");
- var shaderGUIDProp = property.FindPropertyRelative("_shaderGUID");
+ var shaderNameProp = property.FindPropertyRelative(nameof(SerializableShaderWrapper._shaderName));
+ var shaderGUIDProp = property.FindPropertyRelative(nameof(SerializableShaderWrapper._shaderGuid));
 
  shaderObj = Shader.Find(shaderNameProp.stringValue);
  if (!shaderObj)
@@ -25,6 +25,7 @@ protected override void DrawIMGUI(Rect position, SerializedProperty property, GU
  {
  shaderNameProp.stringValue = shaderObj == null ? string.Empty : ((Shader)shaderObj).name;
  shaderGUIDProp.stringValue = shaderObj == null ? string.Empty : AssetDatabaseUtil.GetAssetGUIDString(shaderObj);
+ property.serializedObject.ApplyModifiedProperties();
  }
  EditorGUI.EndProperty();
  }

diff --git a/Editor/Core/SerializableShaderWrapper.cs b/Editor/Core/SerializableShaderWrapper.cs
@@ -34,8 +34,8 @@ public Shader shader
  }
  }
 
- [SerializeField] private string _shaderName;
- [SerializeField] private string _shaderGuid;
+ [SerializeField] internal string _shaderName;
+ [SerializeField] internal string _shaderGuid;
 
  /// <summary>
  /// Creates a new instance of a SerializableShaderWrapper