Fix drawing FormattedNumber for multiple different values; minor refactor changes

Author: arimger

Assets/Editor Toolbox/Editor/Drawers/Regular/FormattedNumberAttributeDrawer.cs

@@ -18,7 +18,6 @@ public class FormattedNumberAttributeDrawer : PropertyDrawerBase
             CurrencyDecimalSeparator = "."
         };
 
-
         private void ApplyControlName(string propertyKey)
         {
             GUI.SetNextControlName(propertyKey);
@@ -42,7 +41,6 @@ private string GetFormat(SerializedProperty property, FormattedNumberAttribute a
             return string.Format("{0}{1}", attribute.Format, isInt ? 0 : attribute.DecimalsToShow);
         }
 
-
         protected override void OnGUISafe(Rect position, SerializedProperty property, GUIContent label)
         {
             var key = property.GetPropertyHashKey();
@@ -62,6 +60,11 @@ protected override void OnGUISafe(Rect position, SerializedProperty property, GU
 #endif
             }
 
+            if (property.hasMultipleDifferentValues)
+            {
+                return;
+            }
+
             var targetAttribute = attribute as FormattedNumberAttribute;
             var single = GetSingle(property);
             var format = GetFormat(property, targetAttribute);
@@ -79,7 +82,6 @@ protected override void OnGUISafe(Rect position, SerializedProperty property, GU
             }
         }
 
-
         public override bool IsPropertyValid(SerializedProperty property)
         {
             return property.propertyType == SerializedPropertyType.Integer ||

Assets/Editor Toolbox/Editor/Utilities/PropertyUtility.cs

@@ -421,7 +421,7 @@ public static void OverrideLabelByValue(GUIContent label, SerializedProperty pro
                     label.text = property.colorValue.ToString();
                     break;
                 case SerializedPropertyType.ObjectReference:
-                    label.text = property.objectReferenceValue ? property.objectReferenceValue.name : "null";
+                    label.text = property.objectReferenceValue ? property.objectReferenceValue.ToString() : "null";
                     break;
                 case SerializedPropertyType.LayerMask:
                     switch (property.intValue)