From b06e27f3c351fb3b8ef90079261bf0097e42c2be Mon Sep 17 00:00:00 2001 From: bd_ Date: Thu, 1 Dec 2022 10:14:08 -0800 Subject: [PATCH] [fix] fix broken material animations (again) (#129) --- Packages/nadena.dev.modular-avatar/Editor/AnimatorMerger.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Packages/nadena.dev.modular-avatar/Editor/AnimatorMerger.cs b/Packages/nadena.dev.modular-avatar/Editor/AnimatorMerger.cs index 3feb079e..7185925c 100644 --- a/Packages/nadena.dev.modular-avatar/Editor/AnimatorMerger.cs +++ b/Packages/nadena.dev.modular-avatar/Editor/AnimatorMerger.cs @@ -244,9 +244,10 @@ namespace nadena.dev.modular_avatar.core.editor case StateMachineBehaviour _: break; // We want to clone these types - // Leave textures and script definitions alone + // Leave textures, materials, and script definitions alone case Texture2D _: case MonoScript _: + case Material _: return original; // Also avoid copying unknown scriptable objects.