Merge branch '294-fields-preceding-expandable-are-not-editable' of ht…

…tps://github.com/rhys-vdw/NaughtyAttributes into rhys-vdw-294-fields-preceding-expandable-are-not-editable
dbrizov · Feb 6, 2022 · 7cddf69 · 7cddf69
2 parents 44b6f95 + 5811f9b
commit 7cddf69
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/Assets/NaughtyAttributes/Scripts/Editor/PropertyDrawers/ExpandablePropertyDrawer.cs b/Assets/NaughtyAttributes/Scripts/Editor/PropertyDrawers/ExpandablePropertyDrawer.cs
@@ -71,7 +71,6 @@ protected override float GetPropertyHeight_Internal(SerializedProperty property,
 		protected override void OnGUI_Internal(Rect rect, SerializedProperty property, GUIContent label)
 		{
 			EditorGUI.BeginProperty(rect, label, property);
-			property.serializedObject.Update();
 
 			if (property.objectReferenceValue == null)
 			{

diff --git a/Assets/NaughtyAttributes/Scripts/Test/ExpandableTest.cs b/Assets/NaughtyAttributes/Scripts/Test/ExpandableTest.cs
@@ -4,6 +4,9 @@ namespace NaughtyAttributes.Test
 {
 	public class ExpandableTest : MonoBehaviour
 	{
+		// See #294
+		public int precedingField = 5;
+
 		[Expandable]
 		public ScriptableObject obj0;