Minor refactor changes

Author: arimger

Assets/Editor Toolbox/Editor/ToolboxEditorGui.cs

@@ -607,29 +607,24 @@ public static void CloseProperty()
         }
 
         /// <summary>
-        /// Displays all visible children associated to the given <see cref="Object"/>.
+        /// Displays all visible children (except the default script property) associated to the given <see cref="Object"/>.
         /// This method doesn't support Toolbox-based features.
         /// </summary>
         public static void DrawObjectProperties(Object instance)
         {
             using (SerializedObject serializedObject = new SerializedObject(instance))
             {
-                using (var iterator = serializedObject.GetIterator())
+                var property = serializedObject.GetIterator();
+                if (property.NextVisible(true))
                 {
-                    if (iterator.NextVisible(true))
+                    if (!PropertyUtility.IsDefaultScriptProperty(property))
                     {
-                        do
-                        {
-                            var name = iterator.name;
-                            SerializedProperty childProperty = serializedObject.FindProperty(name);
-                            if (PropertyUtility.IsDefaultScriptProperty(childProperty))
-                            {
-                                continue;
-                            }
-
-                            DrawNativeProperty(childProperty);
-                        }
-                        while (iterator.NextVisible(false));
+                        DrawNativeProperty(property.Copy());
+                    }
+
+                    while (property.NextVisible(false))
+                    {
+                        DrawNativeProperty(property.Copy());
                     }
                 }
 

Assets/Editor Toolbox/Editor/Wizards/ScriptableObjectCreationWizard.cs

@@ -65,9 +65,10 @@ public void Validate()
         private static readonly TypeField typeField = new TypeField(sharedConstraint, sharedAppearance);
 
         private readonly CreationData data = new CreationData();
-        private bool editDefaultObject;
 
-        [MenuItem("Assets/Create/Toolbox/ScriptableObject Creation Wizard", priority = 9)]
+        private bool inspectDefaultObject;
+
+        [MenuItem("Assets/Create/Toolbox/ScriptableObject Creation Wizard", priority = 5)]
         internal static void Initialize()
         {
             var window = GetWindow<ScriptableObjectCreationWizard>();
@@ -86,28 +87,28 @@ private void DrawSettingsPanel()
             }
 
             EditorGUI.BeginChangeCheck();
-            data.InstanceName = EditorGUILayout.TextField("Instance Name", data.InstanceName);
-            data.InstancesCount = EditorGUILayout.IntField("Instances To Create", data.InstancesCount);
-            var content = new GUIContent("Default Object", "Will be used as a blueprint for all created ScriptableObjects.");
-            var instance = EditorGUILayout.ObjectField(content, data.DefaultObject, data.InstanceType, false);
-            if (instance != null)
+            data.InstanceName = EditorGUILayout.TextField(Style.nameContent, data.InstanceName);
+            data.InstancesCount = EditorGUILayout.IntField(Style.countContent, data.InstancesCount);
+            var assignedInstance = EditorGUILayout.ObjectField(Style.objectContent, data.DefaultObject, data.InstanceType, false);
+            if (assignedInstance != null)
             {
-                editDefaultObject = GUILayout.Toggle(editDefaultObject,
+                inspectDefaultObject = GUILayout.Toggle(inspectDefaultObject,
                     Style.foldoutContent, Style.foldoutStyle, Style.foldoutOptions);
             }
             else
             {
-                editDefaultObject = false;
+                inspectDefaultObject = false;
             }
 
-            if (editDefaultObject)
+            if (inspectDefaultObject)
             {
-                EditorGUI.indentLevel++;
-                ToolboxEditorGui.DrawObjectProperties(instance);
-                EditorGUI.indentLevel--;
+                using (new EditorGUILayout.VerticalScope(Style.backgroundStyle))
+                {
+                    ToolboxEditorGui.DrawObjectProperties(assignedInstance);
+                }
             }
 
-            data.DefaultObject = instance;
+            data.DefaultObject = assignedInstance;
             if (EditorGUI.EndChangeCheck())
             {
                 OnWizardUpdate();
@@ -209,6 +210,9 @@ private static class Style
             internal static readonly GUIStyle backgroundStyle;
             internal static readonly GUIStyle foldoutStyle;
 
+            internal static readonly GUIContent nameContent = new GUIContent("Instance Name");
+            internal static readonly GUIContent countContent = new GUIContent("Instances To Create", "Indicates how many instances will be created.");
+            internal static readonly GUIContent objectContent = new GUIContent("Default Object", "Will be used as a blueprint for all created ScriptableObjects.");
             internal static readonly GUIContent foldoutContent = new GUIContent("Inspect", "Show/Hide Properties");
 
             internal static readonly GUILayoutOption[] foldoutOptions = new GUILayoutOption[]

Assets/Examples/Scripts/SampleBehaviour6.cs

@@ -13,7 +13,7 @@ public class SampleBehaviour6 : MonoBehaviour
     public ClassWithInterfaceBase var2;
     [SerializeReference, ReferencePicker(ParentType = typeof(ClassWithInterface2))]
     public ClassWithInterfaceBase var3;
-    [SerializeField, SerializeReference, ReferencePicker]
+    [SerializeReference, ReferencePicker]
     public Interface1[] vars;
 #endif
 

Assets/Examples/Scripts/SampleScriptableObject.cs

@@ -6,4 +6,5 @@ public class SampleScriptableObject : ScriptableObject
     public bool var1;
     [EnableIf(nameof(var1), true)]
     public int var2;
+    public string[] vars;
 }