Fixed iterator not handling vectors properly

Author: DanielEverland

Assets/SO Architecture/Editor/Drawers/GenericPropertyDrawer.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using UnityEditor;
 using UnityEngine;
 using Object = UnityEngine.Object;

Assets/SO Architecture/Editor/Generic Property Drawer/PropertyIterator.cs

@@ -9,9 +9,7 @@ public class PropertyIterator : IPropertyIterator
     {
         public PropertyIterator(SerializedProperty property)
         {
-            iterator = property;
-            Next();
-            
+            iterator = property.Copy();
             endProperty = iterator.GetEndProperty();
         }
 
@@ -23,44 +21,33 @@ public PropertyIterator(SerializedProperty property)
 
         public virtual bool Next()
         {
-            bool nextVisible = iterator.NextVisible(true);
-            bool canDraw = CanDraw();
-
-            if (nextVisible)
+            bool nextVisible = false;
+            if(IsSingleLine(iterator))
             {
-                if (IsScriptField(iterator))
-                    nextVisible = NextVisible();
-
-                if (consumeChildren)
-                {
-                    ConsumeSingleLineFields(parentDepth);
-                    consumeChildren = false;
-                }
-
-                int depth = iterator.depth;
-                if (IsSingleLine(iterator))
-                {
-                    parentDepth = depth;
-                    consumeChildren = true;
-                }
+                parentDepth = iterator.depth;
+                nextVisible = iterator.NextVisible(false);
             }
-
-            return nextVisible && canDraw;
+            else
+            {
+                nextVisible = iterator.NextVisible(true);
+            }
+            
+            return nextVisible && CanDraw();
         }
         public virtual void End()
         {
         }
-        private bool CanDraw()
-        {
-            return !SerializedProperty.EqualContents(iterator, endProperty);
-        }
-        private void ConsumeSingleLineFields(int depth)
+        private void UpdateState(SerializedProperty property)
         {
-            do
+            if (IsSingleLine(iterator))
             {
-                iterator.Next(true);
+                parentDepth = iterator.depth;
+                consumeChildren = true;
             }
-            while (iterator.depth != depth);
+        }
+        private bool CanDraw()
+        {
+            return !SerializedProperty.EqualContents(iterator, endProperty);
         }
         private bool IsSingleLine(SerializedProperty property)
         {
@@ -81,10 +68,6 @@ private bool IsSingleLine(SerializedProperty property)
 
             return false;
         }
-        private bool IsScriptField(SerializedProperty property)
-        {
-            return property.propertyPath == "m_Script";
-        }
         private bool NextVisible()
         {
             return iterator.NextVisible(true);

Assets/SO Architecture/Editor/Inspectors/BaseVariableEditor.cs

@@ -47,8 +47,8 @@ public override void OnInspectorGUI()
         }
         protected virtual void DrawValue()
         {
-            //GenericPropertyDrawer.DrawPropertyDrawerLayoutNew(_valueProperty, Target.Type);
-            GenericPropertyDrawer.DrawPropertyDrawerLayoutNew(serializedObject.GetIterator(), Target.Type);
+            GenericPropertyDrawer.DrawPropertyDrawerLayoutNew(_valueProperty, Target.Type);
+            //GenericPropertyDrawer.DrawPropertyDrawerLayoutNew(serializedObject.GetIterator(), Target.Type);
 
             EditorGUILayout.Space();