Merge branch 'master' into feature/backing-field-support

Author: Bruno Mikoski

Scripts/Editor/Core/CodeGenerationUtility.cs

@@ -346,7 +346,11 @@ public static void GenerateIndirectAccessForCollectionItemType(string collection
 
             // Delete any existing files that have the old deprecated extension.
             string deprecatedFileName = targetFileName + ExtensionOld;
+#if UNITY_2023_1_OR_NEWER
             if (AssetDatabase.AssetPathExists(deprecatedFileName))
+#else
+            if (AssetDatabase.LoadAssetAtPath<UnityEngine.Object>(deprecatedFileName) != null)
+#endif
             {
                 Debug.LogWarning($"Deleting deprecated Indirect Access file '{deprecatedFileName}'.");
                 AssetDatabase.DeleteAsset(deprecatedFileName);

Scripts/Editor/PropertyDrawers/CollectionItemPropertyDrawer.cs

@@ -114,7 +114,9 @@ internal void DrawCollectionItemDrawer(
         {
             float originY = position.y;
             position.height = 15;
-            Rect prefixPosition = EditorGUI.PrefixLabel(position, label);
+            bool shouldDrawLabel = OptionsAttribute.LabelMode != LabelMode.NoLabel;
+            Rect prefixPosition = shouldDrawLabel ? EditorGUI.PrefixLabel(position, label) : position;
+            
             int indent = EditorGUI.indentLevel;
             EditorGUI.indentLevel = 0;
             if (collectionItem != null)

Scripts/Runtime/Attributes/SOCItemEditorOptionsAttribute.cs

@@ -9,6 +9,13 @@ public enum DrawType
         AsReference = 1
     }
 
+    public enum LabelMode
+    {
+        Default = 0,
+        NoLabel = 1,
+        //LabelOnSeparateLine = 2, // TODO
+    }
+    
 #if UNITY_2022_2_OR_NEWER
     [Obsolete("DrawAsSOCItemAttribute is not needed anymore, since Unity 2022 PropertyDrawers can be applied to interfaces")]
 #endif
@@ -34,7 +41,9 @@ public class SOCItemEditorOptionsAttribute : Attribute
         /// If specified, only show collection items that belong to the collection assigned to the specified field.
         /// </summary>
         public string ConstrainToCollectionField { get; set; }
-        
+
+        public LabelMode LabelMode { get; set; }
+
         /// <summary>
         /// If specified, will perform this method whenever the value changes.
         /// Parameters of the method should be: ItemType from, ItemType to
@@ -47,4 +56,4 @@ public class SOCItemEditorOptionsAttribute : Attribute
     public class CollectionItemEditorOptions : SOCItemEditorOptionsAttribute
     {
     }
-}
+}