fix: proxy animations not being preserved

bdunderscore · Sep 23, 2023 · 512a7b9 · 512a7b9
1 parent 1f313de
commit 512a7b9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/Packages/nadena.dev.modular-avatar/Editor/Animation/AnimationUtil.cs b/Packages/nadena.dev.modular-avatar/Editor/Animation/AnimationUtil.cs
@@ -173,7 +173,8 @@ public static bool IsProxyAnimation(this Motion m)
             // 3. VCC based installations of the VRCSDK
             // 4. Very old VCC based installations of the VRCSDK where proxy animations were copied into Assets
             return path.Contains("/AV3 Demo Assets/Animation/ProxyAnim/proxy")
-                   || path.Contains("/VRCSDK/Examples3/Animation/ProxyAnim/proxy");
+                   || path.Contains("/VRCSDK/Examples3/Animation/ProxyAnim/proxy")
+                   || path.StartsWith("Packages/com.vrchat.");
         }
 
         /// <summary>

diff --git a/Packages/nadena.dev.modular-avatar/Editor/Animation/TrackObjectRenamesContext.cs b/Packages/nadena.dev.modular-avatar/Editor/Animation/TrackObjectRenamesContext.cs
@@ -272,6 +272,8 @@ private AnimationClip ApplyMappingsToClip(AnimationClip originalClip,
             if (originalClip == null) return null;
             if (clipCache != null && clipCache.TryGetValue(originalClip, out var cachedClip)) return cachedClip;
 
+            if (originalClip.IsProxyAnimation()) return originalClip;
+
             var newClip = new AnimationClip();
             newClip.name = originalClip.name;