From d087b05c8a1d7fa0340eb301acac6c72fdbe4eaa Mon Sep 17 00:00:00 2001
From: JLChnToZ <jeremylam619@gmail.com>
Date: Tue, 22 Oct 2024 22:34:43 +0800
Subject: [PATCH] Set defaults to ModularAvatarMergeAnimator to prevent
 potential errors

---
 Editor/ReactiveObjects/ParameterAssignerPass.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Editor/ReactiveObjects/ParameterAssignerPass.cs b/Editor/ReactiveObjects/ParameterAssignerPass.cs
index 179c7061..5d85b67e 100644
--- a/Editor/ReactiveObjects/ParameterAssignerPass.cs
+++ b/Editor/ReactiveObjects/ParameterAssignerPass.cs
@@ -4,6 +4,7 @@ using System.Linq;
 using nadena.dev.ndmf;
 using UnityEngine;
 using UnityEditor.Animations;
+using VRC.SDK3.Avatars.Components;
 using VRC.SDK3.Avatars.ScriptableObjects;
 
 namespace nadena.dev.modular_avatar.core.editor
@@ -191,7 +192,10 @@ namespace nadena.dev.modular_avatar.core.editor
             if (_mamiByParam.Count > 0)
             {
                 // This make sures the parameters are correctly merged into the FX layer.
-                context.AvatarRootObject.AddComponent<ModularAvatarMergeAnimator>().animator = new AnimatorController
+                var mergeAnimator = context.AvatarRootObject.AddComponent<ModularAvatarMergeAnimator>();
+                mergeAnimator.layerType = VRCAvatarDescriptor.AnimLayerType.FX;
+                mergeAnimator.deleteAttachedAnimator = false;
+                mergeAnimator.animator = new AnimatorController
                 {
                     parameters = _mamiByParam.Keys.Select(name => new AnimatorControllerParameter
                     {