Merge pull request #108 from immersivecognition/personal/jack/2022-improvements

fixes for editor helpers in unity 2021+

Author: jackbrookes

Assets/UXF/Prefabs/[UXF_Rig].prefab

@@ -4040,6 +4040,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   sortDataIntoFolders: 1
+  forceENUSLocale: 1
   verboseDebug: 0
 --- !u!1 &4157116251522641278
 GameObject:

Assets/UXF/Scripts/Etc/Editor/EasyEventEditor.cs

@@ -59,7 +59,11 @@ public class EasyEventEditorHandler
     private const string eeeGroupSameComponentTypeKey = "EEE.groupSameComponentType";
     private const string eeeUseHotkeys = "EEE.usehotkeys";
 
+#if UNITY_2021_1_OR_NEWER
+    // no need in Unity 2021
+#else
     private static bool patchApplied = false;
+#endif
     private static FieldInfo internalDrawerTypeMap = null;
     private static System.Type attributeUtilityType = null;
 

Assets/UXF/Scripts/Etc/ReorderableInspector/Editor/ReorderableArrayInspector.cs

@@ -179,13 +179,21 @@ public bool DoLayoutProperty(SerializedProperty property)
 
 				// Draw the header
 				string headerText = string.Format("{0} [{1}]", property.displayName, property.arraySize);
-				EditorGUILayout.PropertyField(property, new GUIContent(headerText), false);
+
+                bool drawChildren;
+#if UNITY_2020_2_OR_NEWER
+				EditorGUILayout.PropertyField(property, new GUIContent(headerText), true);
+				drawChildren = false;
+#else
+                EditorGUILayout.PropertyField(property, new GUIContent(headerText), false);
+				drawChildren = property.isExpanded;
+#endif
 
 				// Save header rect for handling drag and drop
 				Rect dropRect = GUILayoutUtility.GetLastRect();
 
 				// Draw the reorderable list for the property
-				if (property.isExpanded)
+				if (drawChildren)
 				{
 					int newArraySize = EditorGUILayout.IntField("Size", property.arraySize);
 					if (newArraySize != property.arraySize)

Assets/UXF/VERSION.txt

@@ -1 +1 @@
-2.3.6
+2.3.7