From 2f27b13dc0b673b41eca3b80bdcd3fea1f484050 Mon Sep 17 00:00:00 2001
From: bd_ <bd_@nadena.dev>
Date: Sun, 17 Sep 2023 22:21:04 +0900
Subject: [PATCH] fix: Restore a couple of passes lost in the merge

---
 .../Editor/Animation.meta                     |  2 +-
 .../Editor/Animation/AnimationUtil.cs.meta    |  2 +-
 .../Editor/Animation/AnimatorCombiner.cs.meta |  2 +-
 .../Animation/IOnCommitObjectRenames.cs.meta  |  2 +-
 .../TrackObjectRenamesContext.cs.meta         |  2 +-
 .../PluginDefinition/PluginDefinition.cs      | 19 ++++++++++++++++++-
 Packages/packages-lock.json                   | 15 +++++++--------
 7 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/Packages/nadena.dev.modular-avatar/Editor/Animation.meta b/Packages/nadena.dev.modular-avatar/Editor/Animation.meta
index 3c375294..dddbe7c2 100644
--- a/Packages/nadena.dev.modular-avatar/Editor/Animation.meta
+++ b/Packages/nadena.dev.modular-avatar/Editor/Animation.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 0985d0cf1a434879b3ec7e80a90bc598
+guid: 9aeea331419795c41a97112c489b1632
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}
diff --git a/Packages/nadena.dev.modular-avatar/Editor/Animation/AnimationUtil.cs.meta b/Packages/nadena.dev.modular-avatar/Editor/Animation/AnimationUtil.cs.meta
index f571a983..53df83a0 100644
--- a/Packages/nadena.dev.modular-avatar/Editor/Animation/AnimationUtil.cs.meta
+++ b/Packages/nadena.dev.modular-avatar/Editor/Animation/AnimationUtil.cs.meta
@@ -1,3 +1,3 @@
 fileFormatVersion: 2
-guid: e0ef93cb5a6c4e46bb3318ae8116de77
+guid: af583e8ac3104fa4f8466741614219a0
 timeCreated: 1691238553
\ No newline at end of file
diff --git a/Packages/nadena.dev.modular-avatar/Editor/Animation/AnimatorCombiner.cs.meta b/Packages/nadena.dev.modular-avatar/Editor/Animation/AnimatorCombiner.cs.meta
index 2896d8af..699e48b0 100644
--- a/Packages/nadena.dev.modular-avatar/Editor/Animation/AnimatorCombiner.cs.meta
+++ b/Packages/nadena.dev.modular-avatar/Editor/Animation/AnimatorCombiner.cs.meta
@@ -1,3 +1,3 @@
 fileFormatVersion: 2
-guid: 5a3369cd20964957920c3fe8b54df521
+guid: 00241ec2d86cdae4bb5076af0699b33a
 timeCreated: 1691238359
\ No newline at end of file
diff --git a/Packages/nadena.dev.modular-avatar/Editor/Animation/IOnCommitObjectRenames.cs.meta b/Packages/nadena.dev.modular-avatar/Editor/Animation/IOnCommitObjectRenames.cs.meta
index b437d41b..235d4967 100644
--- a/Packages/nadena.dev.modular-avatar/Editor/Animation/IOnCommitObjectRenames.cs.meta
+++ b/Packages/nadena.dev.modular-avatar/Editor/Animation/IOnCommitObjectRenames.cs.meta
@@ -1,3 +1,3 @@
 fileFormatVersion: 2
-guid: 17002a48bb4b4ea79993e0549faf2d0e
+guid: 6a66f552b8b334a45a986bfcf6767200
 timeCreated: 1692511752
\ No newline at end of file
diff --git a/Packages/nadena.dev.modular-avatar/Editor/Animation/TrackObjectRenamesContext.cs.meta b/Packages/nadena.dev.modular-avatar/Editor/Animation/TrackObjectRenamesContext.cs.meta
index acdf8593..5d2a212d 100644
--- a/Packages/nadena.dev.modular-avatar/Editor/Animation/TrackObjectRenamesContext.cs.meta
+++ b/Packages/nadena.dev.modular-avatar/Editor/Animation/TrackObjectRenamesContext.cs.meta
@@ -1,3 +1,3 @@
 fileFormatVersion: 2
-guid: deb8a666d3af40b0be0ac616cf98a05b
+guid: f60ee78d127fda546a84d5396edfc8b2
 timeCreated: 1691237971
\ No newline at end of file
diff --git a/Packages/nadena.dev.modular-avatar/Editor/PluginDefinition/PluginDefinition.cs b/Packages/nadena.dev.modular-avatar/Editor/PluginDefinition/PluginDefinition.cs
index de44edcc..14f32443 100644
--- a/Packages/nadena.dev.modular-avatar/Editor/PluginDefinition/PluginDefinition.cs
+++ b/Packages/nadena.dev.modular-avatar/Editor/PluginDefinition/PluginDefinition.cs
@@ -38,7 +38,24 @@ namespace nadena.dev.modular_avatar.core.editor.plugin
                 });
                 seq.Run(BlendshapeSyncAnimationPluginPass.Instance);
                 seq.Run(PhysbonesBlockerPluginPass.Instance);
-                ;
+                seq.Run("Fixup Expressions Menu", ctx =>
+                {
+                    var maContext = ctx.Extension<ModularAvatarContext>().BuildContext;
+                    FixupExpressionsMenuPass.FixupExpressionsMenu(maContext);
+                });
+                seq.Run("Rebind humanoid avatar", ctx =>
+                {
+                    // workaround problem with avatar matching
+                    // https://github.com/bdunderscore/modular-avatar/issues/430
+                    var animator = ctx.AvatarRootObject.GetComponent<Animator>();
+                    if (animator)
+                    {
+                        var avatar = animator.avatar;
+                        animator.avatar = null;
+                        // ReSharper disable once Unity.InefficientPropertyAccess
+                        animator.avatar = avatar;
+                    }
+                });
             });
 
             InPhase(BuildPhase.Optimizing)
diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json
index 5ec6c8cc..de9852ec 100644
--- a/Packages/packages-lock.json
+++ b/Packages/packages-lock.json
@@ -129,6 +129,13 @@
         "com.unity.modules.imgui": "1.0.0"
       }
     },
+    "com.unity.xr.oculus.android": {
+      "version": "2.38.6",
+      "depth": 0,
+      "source": "registry",
+      "dependencies": {},
+      "url": "https://packages.unity.com"
+    },
     "com.unity.xr.oculus.standalone": {
       "version": "2.38.4",
       "depth": 0,
@@ -159,14 +166,6 @@
         "com.unity.nuget.newtonsoft-json": "2.0.2"
       }
     },
-    "com.vrchat.core.vpm-resolver": {
-      "version": "file:com.vrchat.core.vpm-resolver",
-      "depth": 0,
-      "source": "embedded",
-      "dependencies": {
-        "com.unity.nuget.newtonsoft-json": "2.0.2"
-      }
-    },
     "de.thryrallo.vrc.avatar-performance-tools": {
       "version": "https://github.com/Thryrallo/VRC-Avatar-Performance-Tools.git",
       "depth": 0,