fix: indirect references + small tweaks

Author: brunomikoski

Scripts/Editor/CollectableIndirectReferenceDrawer.cs

@@ -15,7 +15,6 @@ public sealed class CollectableIndirectReferenceDrawer : PropertyDrawer
         private SerializedProperty collectableGUIDProperty;
         private SerializedProperty collectionGUIDProperty;
 
-        private CollectableScriptableObject collectableScriptableObject;
         private CollectableScriptableObject cachedReference;
 
         public override void OnGUI(Rect position, SerializedProperty property, GUIContent label)
@@ -24,24 +23,40 @@ public override void OnGUI(Rect position, SerializedProperty property, GUIConten
             collectableGUIDProperty = property.FindPropertyRelative(COLLECTABLE_GUID_PROPERTY_PATH);
             collectionGUIDProperty = property.FindPropertyRelative(COLLECTION_GUID_PROPERTY_PATh);
 
-            if (cachedReference == null 
-                && !string.IsNullOrEmpty(collectableGUIDProperty.stringValue) 
-                && !string.IsNullOrEmpty(collectionGUIDProperty.stringValue))
+            if (objectAssetProperty.objectReferenceValue != null)
             {
-                if (CollectionsRegistry.Instance.TryGetCollectionByGUID(collectionGUIDProperty.stringValue,
-                    out ScriptableObjectCollection collection))
+                if (string.IsNullOrEmpty(collectableGUIDProperty.stringValue)
+                    || string.IsNullOrEmpty(collectionGUIDProperty.stringValue))
                 {
-                    if (collection.TryGetCollectableByGUID(collectableGUIDProperty.stringValue,
-                        out CollectableScriptableObject collectable))
+                    CollectableScriptableObject collectable = objectAssetProperty.objectReferenceValue as CollectableScriptableObject;
+                    collectableGUIDProperty.stringValue = collectable.GUID;
+                    collectionGUIDProperty.stringValue = collectable.Collection.GUID;
+                    objectAssetProperty.serializedObject.ApplyModifiedProperties();
+                }
+            }
+            else
+            {
+                if (!string.IsNullOrEmpty(collectableGUIDProperty.stringValue)
+                    && !string.IsNullOrEmpty(collectionGUIDProperty.stringValue))
+                {
+                    if (CollectionsRegistry.Instance.TryGetCollectionByGUID(collectionGUIDProperty.stringValue,
+                        out ScriptableObjectCollection collection))
                     {
-                        cachedReference = collectable;
+                        if (collection.TryGetCollectableByGUID(collectableGUIDProperty.stringValue,
+                            out CollectableScriptableObject collectable))
+                        {
+                            objectAssetProperty.objectReferenceValue = collectable;
+                            objectAssetProperty.serializedObject.ApplyModifiedProperties();
+                        }
                     }
                 }
             }
-            
+
+            if (cachedReference == null && objectAssetProperty.objectReferenceValue != null)
+                cachedReference = objectAssetProperty.objectReferenceValue as CollectableScriptableObject;
 
             EditorGUI.PropertyField(position, objectAssetProperty, label, true);
-            if (objectAssetProperty.exposedReferenceValue != cachedReference)
+            if (objectAssetProperty.objectReferenceValue != cachedReference)
             {
                 string collectableGUID = string.Empty;
                 string collectionGUID = string.Empty;
@@ -61,6 +76,7 @@ public override void OnGUI(Rect position, SerializedProperty property, GUIConten
                 collectableGUIDProperty.stringValue = collectableGUID;
                 collectionGUIDProperty.stringValue = collectionGUID;
                 objectAssetProperty.serializedObject.ApplyModifiedProperties();
+                EditorUtility.SetDirty(objectAssetProperty.serializedObject.targetObject);
             }
         }
 

Scripts/Editor/ScriptableObjectCollectionCustomEditor.cs

@@ -411,8 +411,6 @@ private void DrawDeleteButton(CollectableScriptableObject item)
                 collection.RemoveAt(index);
                 AssetDatabase.DeleteAsset(AssetDatabase.GetAssetPath(item));
                 ObjectUtility.SetDirty(collection);
-                AssetDatabase.SaveAssets();
-                AssetDatabase.Refresh();
                 filteredItemListDirty = true;
             }
 

Scripts/Runtime/CollectableIndirectReference.cs

@@ -6,11 +6,6 @@ namespace BrunoMikoski.ScriptableObjectCollections
     [Serializable]
     public abstract class CollectableIndirectReference
     {
-#pragma warning disable 0649
-        [SerializeField]
-        private string name;
-#pragma warning restore 0649
- 
         [SerializeField]
         protected string collectableGUID;
 

Scripts/Runtime/Utils/AssetDatabaseUtils.cs

@@ -24,8 +24,6 @@ public static void RenameAsset(Object targetObject, string newName)
             targetObject.name = newName;
             UnityEditor.AssetDatabase.RenameAsset(UnityEditor.AssetDatabase.GetAssetPath(targetObject), newName);
             ObjectUtility.SetDirty(targetObject);
-            UnityEditor.AssetDatabase.SaveAssets();
-            UnityEditor.AssetDatabase.Refresh();
 #endif
         }
     }