From 60f4bb493961e99f018a1c9ec5a12711082f03f9 Mon Sep 17 00:00:00 2001 From: bd_ Date: Thu, 1 Dec 2022 05:29:37 -0800 Subject: [PATCH] Fix some transitions breaking animator merge logic --- Packages/nadena.dev.modular-avatar/Editor/AnimatorMerger.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Packages/nadena.dev.modular-avatar/Editor/AnimatorMerger.cs b/Packages/nadena.dev.modular-avatar/Editor/AnimatorMerger.cs index 46f98330..3feb079e 100644 --- a/Packages/nadena.dev.modular-avatar/Editor/AnimatorMerger.cs +++ b/Packages/nadena.dev.modular-avatar/Editor/AnimatorMerger.cs @@ -240,7 +240,7 @@ namespace nadena.dev.modular_avatar.core.editor case AnimatorController _: case AnimatorState _: case AnimatorStateMachine _: - case AnimatorStateTransition _: + case AnimatorTransitionBase _: case StateMachineBehaviour _: break; // We want to clone these types