Merge pull request #43 from marc-antoine-girard/fix-merge-missing-features

Author: Thundernerd

Editor/Drawers/RawReferenceDrawer.cs

@@ -108,11 +108,7 @@ protected override void OnPropertiesClicked()
 
         private void AvoidDuplicateReferencesInArray()
         {
-            if (!IsPropertyInArray(Property)) 
-                return;
-            if (previousPropertyPath == null) 
-                return;
-            if (previousPropertyPath == Property.propertyPath) 
+            if (!ShouldCheckProperty()) 
                 return;
 
             object currentReferenceValue = RawReferenceValue;
@@ -121,11 +117,21 @@ private void AvoidDuplicateReferencesInArray()
                 return;
 
             if (previousReferenceValue == currentReferenceValue)
-                PropertyValue = CreateInstance(currentReferenceValue);
+            {
+                currentReferenceValue = CreateInstance(currentReferenceValue);
+                PropertyValue = currentReferenceValue;
+            }
 
             previousReferenceValue = currentReferenceValue;
         }
 
+        private bool ShouldCheckProperty()
+        {
+            return IsPropertyInArray(Property) && 
+                   previousPropertyPath != null && 
+                   previousPropertyPath != Property.propertyPath;
+        }
+
         private static bool IsPropertyInArray(SerializedProperty prop)
         {
             return prop.propertyPath.Contains(".Array.data[");

README.md

@@ -61,7 +61,7 @@ And when you click on the object selector button you will be shown a dropdown wi
 ![image](https://user-images.githubusercontent.com/5531467/164994604-15a0d060-72d1-440b-926b-883dd5f31955.png)
 
 As you can see you can select items from multiple locations:
-- Assets (Scriptable Objects that implement said interface)
+- Assets (Scriptable Objects and Prefabs that implement said interface)
 - Classes (custom classes that implement said interface)
 - Scene (objects in the scene that implement said interface)
 

Runtime/ReferenceMode.cs

@@ -2,7 +2,7 @@
 {
     internal enum ReferenceMode
     {
-        Raw,
-        Unity
+        Unity,
+        Raw
     }
 }