Merge pull request #148 from arimger/develop

Develop - 0.14.3

Author: arimger

Assets/Editor Toolbox/CHANGELOG.md

@@ -1,3 +1,16 @@
+## 0.14.3 [29.12.2025]
+
+### Added:
+- Ability to specify 'ValueStep' in the ProgressBar attribute
+
+### Changed:
+- Toolbar support for Unity 6.3+
+- Material Drawers support for Unity 6.3+
+- Serialized Scene support for Unity 6.3+
+- Fix issues with copy/past operations for the [SerializeReference]-based arrays
+- Ability to display parent objects in the SceneView tool
+- Ability to display managed reference values while using LabelByChild attribute
+
 ## 0.14.2 [10.08.2025]
 
 ### Added:

Assets/Editor Toolbox/Editor/ContextMenu/Operations/SerializeReference/CopySerializeReferenceCache.cs

@@ -9,17 +9,18 @@ namespace Toolbox.Editor.ContextMenu.Operations
     /// </summary>
     internal class CopySerializeReferenceCache
     {
-        public CopySerializeReferenceCache(Type referenceType, IReadOnlyList<CopySerializeReferenceEntry> entires)
+        public CopySerializeReferenceCache(Type referenceType, IReadOnlyList<CopySerializeReferenceEntry> entires, bool isArrayCopy)
         {
             ReferenceType = referenceType;
             Entries = entires;
+            IsArrayCopy = isArrayCopy;
         }
 
         /// <summary>
         /// Base managed reference type of the source <see cref="UnityEditor.SerializedProperty"/>.
         /// </summary>
         public Type ReferenceType { get; }
         public IReadOnlyList<CopySerializeReferenceEntry> Entries { get; }
-        public bool IsArrayCopy => Entries != null && Entries.Count > 1;
+        public bool IsArrayCopy { get; }
     }
 }

Assets/Editor Toolbox/Editor/ContextMenu/Operations/SerializeReference/CopySerializeReferenceOperation.cs

@@ -51,6 +51,7 @@ public bool IsEnabled(SerializedProperty property)
 
         public void Perform(SerializedProperty property)
         {
+            var isArrayCopy = false;
             var entries = new List<CopySerializeReferenceEntry>();
             if (property.propertyType == SerializedPropertyType.ManagedReference)
             {
@@ -59,6 +60,7 @@ public void Perform(SerializedProperty property)
             }
             else if (property.isArray)
             {
+                isArrayCopy = true;
                 var propertiesCount = property.arraySize;
                 for (var i = 0; i < propertiesCount; i++)
                 {
@@ -69,7 +71,7 @@ public void Perform(SerializedProperty property)
             }
 
             PropertyUtility.TryGetSerializeReferenceType(property, out var referenceType);
-            Cache = new CopySerializeReferenceCache(referenceType, entries);
+            Cache = new CopySerializeReferenceCache(referenceType, entries, isArrayCopy);
         }
 
         public GUIContent Label => new GUIContent("Copy Serialized References");

Assets/Editor Toolbox/Editor/ContextMenu/Operations/SerializeReference/PasteSerializeReferenceOperation.cs

@@ -36,7 +36,7 @@ private bool IsAssignmentValid(Type targetType, CopySerializeReferenceEntry entr
                 return true;
             }
 
-            return TypeUtility.IsTypeAssignableFrom(targetType, entry.ReferenceType);
+            return TypeUtility.IsTypeAssignableFrom(targetType, entryType);
         }
 
         private bool IsOperationSupported(SerializedProperty targetProperty, CopySerializeReferenceCache cache)

Assets/Editor Toolbox/Editor/Drawers/Material/MaterialCompactTextureDrawer.cs

@@ -27,7 +27,11 @@ protected override void OnGUISafe(Rect position, MaterialProperty prop, string l
 
         protected override bool IsPropertyValid(MaterialProperty prop)
         {
+#if UNITY_6000_3_OR_NEWER
+            return prop.propertyType == UnityEngine.Rendering.ShaderPropertyType.Texture;
+#else
             return prop.type == MaterialProperty.PropType.Texture;
+#endif
         }
     }
 }

Assets/Editor Toolbox/Editor/Drawers/Material/MaterialConditionalDrawer.cs

@@ -12,6 +12,17 @@ protected MaterialConditionalDrawer(string togglePropertyName)
             this.togglePropertyName = togglePropertyName;
         }
 
+        private bool IsValidToggleType(MaterialProperty toggleProp)
+        {
+#if UNITY_6000_3_OR_NEWER
+            return toggleProp.propertyType == UnityEngine.Rendering.ShaderPropertyType.Float ||
+                toggleProp.propertyType == UnityEngine.Rendering.ShaderPropertyType.Range;
+#else
+            return toggleProp.type == MaterialProperty.PropType.Float || 
+                toggleProp.type == MaterialProperty.PropType.Range;
+#endif
+        }
+
         protected override float GetPropertyHeightSafe(MaterialProperty prop, string label, MaterialEditor editor)
         {
             if (!HasToggle(prop))
@@ -48,7 +59,7 @@ protected virtual bool HasToggle(MaterialProperty prop)
         {
             var targets = prop.targets;
             var toggle = MaterialEditor.GetMaterialProperty(targets, togglePropertyName);
-            return toggle != null && toggle.type == MaterialProperty.PropType.Float || toggle.type == MaterialProperty.PropType.Range;
+            return toggle != null && IsValidToggleType(toggle);
         }
 
         protected virtual bool? GetValue(MaterialProperty prop)

Assets/Editor Toolbox/Editor/Drawers/Material/MaterialMinMaxSliderDrawer.cs

@@ -44,7 +44,11 @@ protected override void OnGUISafe(Rect position, MaterialProperty prop, string l
 
         protected override bool IsPropertyValid(MaterialProperty prop)
         {
+#if UNITY_6000_3_OR_NEWER
+            return prop.propertyType == UnityEngine.Rendering.ShaderPropertyType.Vector;
+#else
             return prop.type == MaterialProperty.PropType.Vector;
+#endif
         }
     }
 }

Assets/Editor Toolbox/Editor/Drawers/Material/MaterialVector2Drawer.cs

@@ -30,7 +30,11 @@ protected override void OnGUISafe(Rect position, MaterialProperty prop, string l
 
         protected override bool IsPropertyValid(MaterialProperty prop)
         {
+#if UNITY_6000_3_OR_NEWER
+            return prop.propertyType == UnityEngine.Rendering.ShaderPropertyType.Vector;
+#else
             return prop.type == MaterialProperty.PropType.Vector;
+#endif
         }
     }
 }

Assets/Editor Toolbox/Editor/Drawers/Material/MaterialVector3Drawer.cs

@@ -30,7 +30,11 @@ protected override void OnGUISafe(Rect position, MaterialProperty prop, string l
 
         protected override bool IsPropertyValid(MaterialProperty prop)
         {
+#if UNITY_6000_3_OR_NEWER
+            return prop.propertyType == UnityEngine.Rendering.ShaderPropertyType.Vector;
+#else
             return prop.type == MaterialProperty.PropType.Vector;
+#endif
         }
     }
 }

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

@@ -43,12 +43,18 @@ private void SetProgressValue(SerializedProperty property, Rect progressBarRect,
         {
             var minValue = Attribute.MinValue;
             var maxValue = Attribute.MaxValue;
+            var valueStep = Attribute.ValueStep;
 
             var range = progressBarRect.xMax - progressBarRect.xMin;
             xPosition = Mathf.Clamp(xPosition - progressBarRect.xMin, 0, range);
 
             var fill = Mathf.Clamp01(xPosition / range);
             var newValue = (maxValue - minValue) * fill + minValue;
+            if (!Mathf.Approximately(valueStep, 0.0f))
+            {
+                newValue = Mathf.Round(newValue / valueStep) * valueStep;
+                newValue = Mathf.Clamp(newValue, minValue, maxValue);
+            }
 
             switch (property.propertyType)
             {