Merge pull request #13

dev
techno-dwarf-works · Apr 8, 2023 · 6b2d620 · 6b2d620
1 parent dc2bd4f
commit 6b2d620
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 16 deletions.
diff --git a/Editor/BetterEditorTools.Editor.asmdef b/Editor/BetterEditorTools.Editor.asmdef
@@ -2,7 +2,8 @@
     "name": "BetterEditorTools.Editor",
     "rootNamespace": "Better.EditorTools",
     "references": [
-        "GUID:443314a5a4e67c14a88ae223776b6554"
+        "GUID:443314a5a4e67c14a88ae223776b6554",
+        "GUID:28da8d3b12e3efa47928e0c9070f853d"
     ],
     "includePlatforms": [
         "Editor"

diff --git a/Editor/EditorTools/Drawers/Base/MultiFieldDrawer.cs b/Editor/EditorTools/Drawers/Base/MultiFieldDrawer.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using Better.EditorTools.Comparers;
 using Better.EditorTools.Utilities;
+using Better.Extensions.Runtime;
 using UnityEditor;
 using UnityEngine;
 
@@ -30,19 +31,7 @@ public override void OnGUI(Rect position, SerializedProperty property, GUIConten
 
         protected virtual Type GetFieldOrElementType()
         {
-            var type = fieldInfo.FieldType;
-            if (type.IsArray)
-            {
-                return type.GetElementType();
-            }
-
-            var genericTypeDefinition = type.GetGenericTypeDefinition();
-            if (type.IsGenericType && (genericTypeDefinition == typeof(List<>) || genericTypeDefinition.IsSubclassOf(typeof(List<>))))
-            {
-                return type.GetGenericArguments()[0];
-            }
-
-            return type;
+            return fieldInfo.FieldType.GetArrayOrListElementType();
         }
 
         /// <summary>

diff --git a/package.json b/package.json
@@ -2,10 +2,11 @@
   "name": "com.uurha.bettereditortools",
   "displayName": "Better Editor Tools",
   "description": "Collection of useful tools for Unity Editor",
-  "version": "0.1.7",
+  "version": "0.2.0",
   "unity": "2018.3",
   "dependencies": {
-    "com.uurha.betterdatastructures": "0.0.4"
+    "com.uurha.betterdatastructures": "0.0.4",
+    "com.uurha.betterextensions": "0.3.1"
   },
   "author": {
     "name": "Arcueid D'athemon",