bdunderscore · bdunderscore · Apr 22, 2025 · Apr 20, 2025 · Copilot · Apr 20, 2025
diff --git a/CHANGELOG-PRERELEASE.md b/CHANGELOG-PRERELEASE.md
@@ -10,6 +10,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 
 ### Fixed
+- [#602] Fix issue where, if the hidden "mask" value on the gesture layer in the VRChat avatar controller was missing,
+  the avatar would be stuck in "bicycle pose" in gesture manager and Av3Emulator.
 
 ### Changed
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -15,8 +15,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   - These components are very much subject to change in future builds (and are hidden behind the NDMF_EXPERIMENTAL feature flag)
 
 ### Fixed
-- [#599] Substate machine transitions were not being enumerated (and thus not processed for MA Parameters renaming)
-- [#600] Fix issue where loop time (and other clip settings) were not preserved when there was no additive reference clip.
+- [#602] Fix issue where, if the hidden "mask" value on the gesture layer in the VRChat avatar controller was missing,
+  the avatar would be stuck in "bicycle pose" in gesture manager and Av3Emulator.
 
 ### Changed
 
@@ -26,6 +26,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Deprecated
 
+## [1.7.8] - [2025-04-17]
+
+### Fixed
+- [#599] Substate machine transitions were not being enumerated (and thus not processed for MA Parameters renaming)
+- [#600] Fix issue where loop time (and other clip settings) were not preserved when there was no additive reference clip.
+
 ## [1.7.7] - [2025-04-14]
 
 ### Fixed

diff --git a/Editor/API/AnimatorServices/PlatformBindings/VRChatPlatformAnimatorBindings.cs b/Editor/API/AnimatorServices/PlatformBindings/VRChatPlatformAnimatorBindings.cs
@@ -167,6 +167,16 @@ void EditLayers(VRCAvatarDescriptor.CustomAnimLayer[] layers)
                     {
                         layers[i].animatorController = controller;
                         layers[i].isDefault = false;
+                        if (layers[i].type is VRCAvatarDescriptor.AnimLayerType.Gesture
+                            or VRCAvatarDescriptor.AnimLayerType.FX)
+                        {
+                            // See AvatarDescriptorEditor3.SetLayerMaskFromController
+                            var innerLayers = ((AnimatorController)controller).layers;
+                            if (innerLayers.Length > 0)
+                            {
+                                layers[i].mask = innerLayers[0].avatarMask;
+                            }
+                        }
                     }
                 }
             }

diff --git a/UnitTests~/AnimationServices/VRChatTests.cs b/UnitTests~/AnimationServices/VRChatTests.cs
@@ -1,9 +1,12 @@
 #if NDMF_VRCSDK3_AVATARS
 
 using System.Linq;
+using nadena.dev.ndmf;
 using nadena.dev.ndmf.animator;
 using nadena.dev.ndmf.UnitTestSupport;
 using NUnit.Framework;
+using UnityEditor;
+using UnityEditor.Advertisements;
 using UnityEditor.Animations;
 using UnityEngine;
 using VRC.SDK3.Avatars.Components;
@@ -280,6 +283,47 @@ public void RemapPlayAudioPaths_InVirtualizedController()
 
             Assert.AreEqual("B/A", behaviour.SourcePath);
         }
+
+        [Test]
+        public void AnimatorMaskIsPopulated()
+        {
+            var prefab = AssetDatabase.LoadAssetAtPath<GameObject>("Packages/nadena.dev.ndmf/UnitTests/AnimationServices/_CommonAssets/ShapellAvatar.prefab");
+            var root = TrackObject(Object.Instantiate(prefab));
+
+            // Clear all pre-existing masks
+            var avDesc = root.GetComponent<VRCAvatarDescriptor>();
+            for (int i = 0; i < avDesc.baseAnimationLayers.Length; i++)
+            {
+                var layer = avDesc.baseAnimationLayers[i];
+                layer.mask = null;
+                avDesc.baseAnimationLayers[i] = layer;
+            }
+
+            var ctx = CreateContext(root);
+            ctx.ActivateExtensionContext<VirtualControllerContext>();
+            ctx.DeactivateAllExtensionContexts();
+
+            foreach (var layer in avDesc.baseAnimationLayers)
+            {
+                bool shouldHaveMask = layer.type is VRCAvatarDescriptor.AnimLayerType.FX
+                    or VRCAvatarDescriptor.AnimLayerType.Gesture;
+
+                if (shouldHaveMask)
+                {
+                    Debug.Log("Layer controller type: " + layer.animatorController?.GetType());
+                    Debug.Log("Layer path: " + AssetDatabase.GetAssetPath(layer.animatorController));
+                    Assert.That(layer.animatorController, Is.TypeOf(typeof(AnimatorController)));
+                    var controller = (AnimatorController)layer.animatorController;
-                    var controller = (AnimatorController)layer.animatorController;
+                    var controller = (AnimatorController)layer.animatorController;
+                    Assert.IsTrue(controller.layers.Length > 0, "AnimatorController has no layers.");
-                    var controller = (AnimatorController)layer.animatorController;
+                    var controller = (AnimatorController)layer.animatorController;
+                    Assert.IsTrue(controller.layers.Length > 0, "AnimatorController has no layers.");
+                    var expectedMask = controller.layers[0].avatarMask;
+
+                    Assert.AreSame(expectedMask, layer.mask);
+                }
+                else
+                {
+                    Assert.IsNull(layer.mask);
+                }
+            }
+        }
 
         private AnimatorController BuildInterlayerController(string prefix)
         {

diff --git a/UnitTests~/AnimationServices/_CommonAssets.meta b/UnitTests~/AnimationServices/_CommonAssets.meta