Merge pull request #52 from VRLabs/dev

Stop broken merges

Author: jellejurre

Editor/Elements/AnimatorMergerElement.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using UnityEditor.Animations;
@@ -51,13 +51,28 @@ public AnimatorMergerElement(VrcAnimationLayer layer)
             var layerParameters = layer.Parameters.Select(x => x.Parameter).ToArray();
             var allParameters = layer.AvatarParameters.Where(x => !layerParameters.Contains(x)).ToArray();
 
+            Button mergeOnCurrent = null;
+            Button mergeOnNew = null;
+            
             controller.RegisterValueChangedCallback(evt =>
             {
                 var newController = evt.newValue as AnimatorController;
+                bool allowMerge = true;
 
                 parametersListContainer.Clear();
                 _parametersToMerge.Clear();
 
+
+                if (newController == layer.Controller)
+                {
+                    new Label("Cannot merge controller onto itself.")
+                        .WithClass("red-text")
+                        .ChildOf(parametersListContainer);
+                    mergeOnCurrent.SetEnabled(false);
+                    mergeOnNew.SetEnabled(false);
+                    return;
+                }
+                
                 if (newController == null) return;
 
                 foreach (var param in newController.parameters)
@@ -73,6 +88,13 @@ public AnimatorMergerElement(VrcAnimationLayer layer)
                     var suffixField = new TextField(p.Name).ChildOf(itemContainer);
                     suffixField.tooltip = p.Name;
 
+                    if (layerParameters.Any(x => x.nameHash == param.nameHash && x.type != param.type))
+                    {
+                        allowMerge = false;
+                        new Label("Target controller contains this parameter with a different type than the base controller. These controllers cannot be merged.")
+                            .WithClass("red-text")
+                            .ChildOf(itemContainer);
+                    } 
                     if (AV3Manager.VrcParameters.Any(x => x == param.name))
                     {
                         new Label("Parameter is a default one, by default it will be added to the parameters, but not listed in the synced parameters, you should not add any affix unless you know what you're doing")
@@ -110,17 +132,26 @@ public AnimatorMergerElement(VrcAnimationLayer layer)
                     _parametersToMerge.Add(p);
                 }
 
+                if (!allowMerge)
+                {
+                    new Label("Target controller contains a parameter with a different type than the base controller. These controllers cannot be merged.")
+                        .WithClass("red-text")
+                        .ChildOf(parametersListContainer);
+                }
+                
+                mergeOnCurrent.SetEnabled(allowMerge);
+                mergeOnNew.SetEnabled(allowMerge);
             });
 
             var operationsArea = new VisualElement()
                 .WithClass("top-spaced")
                 .WithFlexDirection(FlexDirection.Row)
                 .ChildOf(this);
-            var mergeOnCurrent = FluentUIElements
+            mergeOnCurrent = FluentUIElements
                 .NewButton("Merge on current", "Merge this animator on the current layer animator")
                 .WithClass("grow-control")
                 .ChildOf(operationsArea);
-            var mergeOnNew = FluentUIElements
+            mergeOnNew = FluentUIElements
                 .NewButton("Merge on new", "Create a copy of the layer animator and merge this animator on that")
                 .WithClass("grow-control")
                 .ChildOf(operationsArea);

Editor/Tabs/LayersTab.cs

@@ -382,7 +382,6 @@ private void UpdateParameters()
                              x.type == AnimatorControllerParameterType.Float ||
                              x.type == AnimatorControllerParameterType.Bool))
                 {
-                    if (AV3Manager.VrcParameters.Count(x => x.Equals(parameter.name)) > 0) continue;
                     bool isExpression = _expressionParameters != null && _expressionParameters.FindParameter(parameter.name) != null;
                     bool isSynced = isExpression
                         ? _expressionParameters.FindParameter(parameter.name).networkSynced