Fix issues during merge

Author: marc-antoine-girard

Editor/Drawers/RawReferenceDrawer.cs

@@ -14,32 +14,9 @@ internal class RawReferenceDrawer : ReferenceDrawer, IReferenceDrawer
         private object previousReferenceValue;
         private string previousPropertyPath;
 
-        private object RawReferenceValue
-        {
-            get
-            {
-#if UNITY_2021_1_OR_NEWER
-                return RawReferenceProperty.managedReferenceValue;
-#else
-                ISerializableInterface instance =
-                    (ISerializableInterface)fieldInfo.GetValue(Property.serializedObject.targetObject);
-                return instance.GetRawReference();
-#endif
-            }
-
-            set
-            {
-#if UNITY_2021_1_OR_NEWER
-                RawReferenceProperty.managedReferenceValue = value;
-#else
-                fieldInfo.SetValue(Property.serializedObject.targetObject, value);
-#endif
-            }
-        }
-
         public void Initialize(SerializedProperty property, Type genericType, GUIContent label, FieldInfo fieldInfo)
         {
-            Initialize(property, genericType);
+            Initialize(property, genericType, fieldInfo);
             this.label = label;
         }
 

Editor/Drawers/ReferenceDrawer.cs

@@ -31,7 +31,7 @@ private enum DragAndDropMode
         protected SerializedProperty RawReferenceProperty => Property.FindPropertyRelative("rawReference");
         protected SerializedProperty UnityReferenceProperty => Property.FindPropertyRelative("unityReference");
 
-        protected readonly FieldInfo fieldInfo;
+        protected FieldInfo FieldInfo { get; private set; }
 
         protected ReferenceMode ModeValue
         {
@@ -47,7 +47,7 @@ protected object RawReferenceValue
                 return RawReferenceProperty.managedReferenceValue;
 #else
                 ISerializableInterface instance =
-                    (ISerializableInterface)fieldInfo.GetValue(Property.serializedObject.targetObject);
+                    (ISerializableInterface)FieldInfo.GetValue(Property.serializedObject.targetObject);
                 return instance.GetRawReference();
 #endif
             }
@@ -56,7 +56,7 @@ protected object RawReferenceValue
 #if UNITY_2021_1_OR_NEWER
                 RawReferenceProperty.managedReferenceValue = value;
 #else
-                fieldInfo.SetValue(Property.serializedObject.targetObject, value);
+                FieldInfo.SetValue(Property.serializedObject.targetObject, value);
 #endif
             }
         }
@@ -101,10 +101,11 @@ protected ReferenceDrawer()
             CustomObjectDrawer.PropertiesClicked += OnPropertiesClicked;
         }
 
-        protected void Initialize(SerializedProperty property, Type genericType)
+        protected void Initialize(SerializedProperty property, Type genericType, FieldInfo fieldInfo)
         {
             Property = property;
             GenericType = genericType;
+            FieldInfo = fieldInfo;
         }
 
         private void OnButtonClicked(Rect position)
@@ -137,6 +138,7 @@ private void OnClicked()
 
         private void OnDeletePressed()
         {
+            ModeValue = default;
             PropertyValue = null;
         }
 

Editor/Drawers/UnityReferenceDrawer.cs

@@ -11,9 +11,9 @@ internal class UnityReferenceDrawer : ReferenceDrawer, IReferenceDrawer
     {
         private GUIContent label;
 
-        public void Initialize(SerializedProperty property, Type genericType, GUIContent label)
+        public void Initialize(SerializedProperty property, Type genericType, GUIContent label, FieldInfo fieldInfo)
         {
-            Initialize(property, genericType);
+            Initialize(property, genericType, fieldInfo);
             this.label = label;
         }