From 8622c9c04426122b2d2f8bca33769627d982ee33 Mon Sep 17 00:00:00 2001
From: bd_ <bdunderscore@fushizen.net>
Date: Tue, 29 Nov 2022 09:43:53 -0800
Subject: [PATCH] Fix merging of material swap animations

---
 .../nadena.dev.modular-avatar/Editor/AnimatorMerger.cs     | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/Packages/nadena.dev.modular-avatar/Editor/AnimatorMerger.cs b/Packages/nadena.dev.modular-avatar/Editor/AnimatorMerger.cs
index 19401efc..3e4962be 100644
--- a/Packages/nadena.dev.modular-avatar/Editor/AnimatorMerger.cs
+++ b/Packages/nadena.dev.modular-avatar/Editor/AnimatorMerger.cs
@@ -231,6 +231,13 @@ namespace nadena.dev.modular_avatar.core.editor
         {
             if (original == null) return null;
 
+            switch (original)
+            {
+                case Texture _:
+                case Material _:
+                    return original;
+            }
+
             if (cloneMap == null) cloneMap = new Dictionary<Object, Object>();
 
             if (cloneMap.ContainsKey(original))