Release 1.13.0-alpha.1

chore: update changelog for stable release
fix: merge blend tree does not correct parameter type conflicts (#1552 )
2025-04-11 23:19:00 +08:00 · 2025-04-10 03:29:38 +00:00 · 2025-04-09 20:24:51 -07:00 · 2025-04-09 20:05:48 -07:00 · 2025-04-09 20:00:40 -07:00 · 2025-04-09 19:14:44 -07:00
81 changed files with 3329 additions and 169 deletions
--- a/.github/ProjectRoot/vpm-manifest-2022.json
+++ b/.github/ProjectRoot/vpm-manifest-2022.json
@ -4,7 +4,7 @@
      "version": "3.7.4"
    },
    "nadena.dev.ndmf": {
-      "version": "1.7.0-beta.0"
+      "version": "1.8.0-alpha.4"
    }
  },
  "locked": {
@ -19,7 +19,7 @@
      "dependencies": {}
    },
    "nadena.dev.ndmf": {
-      "version": "1.7.0-beta.0"
+      "version": "1.8.0-alpha.4"
    }
  }
 }
--- a/.github/workflows/deploy-pages.yml
+++ b/.github/workflows/deploy-pages.yml
@ -41,12 +41,12 @@ jobs:
  build-docs:
    name: Build documentation (latest release)
    # TODO - update to build-docs.yml
-    uses: bdunderscore/modular-avatar/.github/workflows/build-test-docs.yml@docs-snapshot
+    uses: bdunderscore/modular-avatar/.github/workflows/build-test-docs.yml@main
    needs:
      - snapshot-docs
    with:
      ref: docs-snapshot
-      #prerelease: false TODO - uncomment once we release
+      prerelease: false
    
  build-docs-dev:
    name: Build documentation (main branch)
--- a/.github/workflows/perform-release.yml
+++ b/.github/workflows/perform-release.yml
@ -56,7 +56,7 @@ jobs:
        run: echo "$GITHUB_CONTEXT"

      # https://github.com/orgs/community/discussions/13836#discussioncomment-8535364
-      - uses: actions/create-github-app-token@v1
+      - uses: actions/create-github-app-token@v2
        id: app-token
        with:
          app-id: ${{ vars.RELEASER_APP_ID }}
@ -148,9 +148,12 @@ jobs:

          if [ "${{ env.PRERELEASE }}" == "true" ]; then
            ./.github/cut-changelog.pl CHANGELOG-PRERELEASE.md .github/CHANGELOG-HEADER.md ${{ env.VERSION }} .github/relnote-en.md
+            ./.github/cut-changelog.pl CHANGELOG-PRERELEASE-jp.md .github/CHANGELOG-HEADER.md ${{ env.VERSION }} .github/relnote-jp.md
          else
            ./.github/cut-changelog.pl CHANGELOG-PRERELEASE.md .github/CHANGELOG-HEADER.md ${{ env.VERSION }}
+            ./.github/cut-changelog.pl CHANGELOG-PRERELEASE-jp.md .github/CHANGELOG-HEADER.md ${{ env.VERSION }}
            ./.github/cut-changelog.pl CHANGELOG.md .github/CHANGELOG-HEADER.md ${{ env.VERSION }} .github/relnote-en.md
+            ./.github/cut-changelog.pl CHANGELOG-jp.md .github/CHANGELOG-HEADER.md ${{ env.VERSION }} .github/relnote-jp.md
          fi

          echo Version ${{ env.VERSION }} > release-note.md
@ -162,7 +165,10 @@ jobs:
          fi
          echo '## Notable changes' >> release-note.md
          cat .github/relnote-en.md >> release-note.md
-
+          echo >> release-note.md
+          echo '## 主な変更点' >> release-note.md
+          cat .github/relnote-jp.md >> release-note.md
+          
      - name: Upload CHANGELOG.md
        if: ${{ github.event.inputs.release_kind == 'stable' }}
        uses: actions/upload-artifact@v4
--- a/CHANGELOG-PRERELEASE-jp.md
+++ b/CHANGELOG-PRERELEASE-jp.md
@ -7,6 +7,90 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

 ## [Unreleased]

+### Added
+
+### Fixed
+
+### Changed
+
+### Removed
+
+### Security
+
+### Deprecated
+
+## [1.13.0-alpha.1] - [2025-04-10]
+
+### Fixed
+- [#1552] Merge Blend Treeにて、メインアバターFXレイヤーと同じ名前のintやboolパラメーターがBlend Treeに含まれている場合、
+  パラメーター型が修正されない問題を修正
+- [#1553] リアクティブコンポーネントが生成するステートに、WD設定が正しくない問題を修正
+
+### Changed
+- [#1551] Merge Animatorは、遷移のない単一のstateを持つブレンドツリーのレイヤーに対して常にWDをONに設定します。
+  - 一部、以前の挙動に依存したアセットとの互換性を向上させるための変更です。
+
+## [1.13.0-alpha.0] - [2025-04-08]
+
+### Added
+- (実験的機能) VRC以外のプラットフォームのサポートを有効化
+
+## [1.12.3] - [2025-04-05]
+
+### Fixed
+- Additiveレイヤーの問題を修正（NDMFバージョンアップグレードによって修正）
+
+### Changed
+- [#1542] Merge Animatorは、アニメーションクリップを含む単一のstateを持つレイヤーに対してWD設定を一致させるが、
+　    ブレンドツリーを含む場合は一致させないように変更されました。
+  - これにより、1.12で導入された互換性の問題が修正されます（1.12.0では、単一のstateアニメーションクリップに対してWD設定
+    と一致しないように変更されました）。
+
+## [1.12.2] - [2025-04-03]
+
+### Fixed
+- [#1537] アニメーターパラメーターをアニメーションさせるカーブが、`Merge Motion` コンポーネントを使用して追加された場合、
+  `Rename Parameters` によって更新されない問題を修正``
+
+## [1.12.1] - [2025-04-02]
+
+### Fixed
+- [#1532] Modular Avatarが新しく作成したプロジェクトでコンパイラエラーを出す問題を修正
+
+## [1.12.0] - [2025-04-01]
+
+### Fixed
+- [#1531] lylicalInventoryとの互換性問題を修正
+
+### Changed
+- [#1530] `MA Menu Item`の自動パラメーター機能も、オブジェクトのパスに基づいて名前を割り当てるようになりました。
+
+## [1.12.0-rc.1] - [2025-03-28]
+
+### Added
+- [#1524] MMDワールド対応をアバター全体で無効にする機能を追加
+
+### Fixed
+- [#1522] `Convert Constraints` がアニメーション参照を変換できない問題を修正
+- [#1528] `Merge Animator` が `アバターのWrite Defaults設定に合わせる` 設定を無視し、常に合わせてしまう問題を修正
+
+### Changed
+- [#1529] `MA Parameters` の自動リネームは、オブジェクトのパスに基づいて新しい名前を割り当てるように変更されました。これにより、
+  `MA Sync Parameter Sequence` との互換性が向上します。
+  - `MA Sync Parameter Sequence` を使用している場合は、このバージョンに更新した後、SyncedParamsアセットを空にして、
+    すべてのプラットフォームを再アップロードすることをお勧めします。
+
+## [1.12.0-rc.0] - [2025-03-22]
+
+### Fixed
+- [#1508] テクスチャのサイズが4の倍数でない場合に、エクスプレッションメニューアイコンの自動圧縮が失敗する問題を修正
+- [#1513] iOSビルドでエクスプレッションメニューアイコンの圧縮が壊れる問題を修正
+
+### Changed
+- [#1514] `Merge Blend Tree` は `Merge Motion (Blend Tree)` に改名され、アニメーションクリップにも対応するようになりました
+
+## [1.12.0-beta.0] - [2025-03-17]
+
 ### Added
 - [#1497] CHANGELOGをドキュメンテーションサイトに追加
 - [#1482] `Merge Animator` に既存のアニメーターコントローラーを置き換える機能を追加
@ -32,12 +116,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
  詳細は[ドキュメント](https://modular-avatar.nadena.dev/docs/general-behavior/mmd)を参照してください。
 - [#1502] `World Fixed Object` は `VRCParentConstraint` を使用するようになり、Androidビルドで使用可能になりました。

-### Removed
-
-### Security
-
-### Deprecated
-
 ## [1.12.0-alpha.2] - [2025-03-10]

 ### Added
--- a/CHANGELOG-PRERELEASE.md
+++ b/CHANGELOG-PRERELEASE.md
@ -19,6 +19,76 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

 ### Deprecated

+## [1.13.0-alpha.1] - [2025-04-10]
+
+### Fixed
+- [#1552] Merge Blend Tree failed to correct parameter types when the main avatar FX layer contained an int or bool
+  parameter with the same name as one used in the blend tree.
+- [#1553] Reactive components might generate states with incorrect write default settings
+
+### Changed
+- [#1551] Merge Animator will always set WD ON for single-state blendtree layers with no any state transitions.
+  - This fixes compatibility issues with assets which relied on the prior behavior.
+
+## [1.13.0-alpha.0] - [2025-04-08]
+
+### Added
+- (Experimental feature) Enabled support for non-VRC platforms
+
+## [1.12.3] - [2025-04-05]
+
+### Fixed
+- Fixed issues with additive layers (via NDMF version upgrade)
+
+### Changed
+- [#1542] Merge Animator now will match WD settings for layers with a single state containing an animation clip,
+  but not if it contains a blend tree. This fixes some compatibility issues introduced in 1.12 (where the behavior
+  was changed to not match WD settings for single-state animation clips).
+
+## [1.12.2] - [2025-04-03]
+
+### Fixed
+- [#1537] Curves which animated animator parameters, when added using a `Merge Motion` component, would not be updated by
+  `Rename Parameters`
+
+## [1.12.1] - [2025-04-02]
+
+### Fixed
+- [#1532] Modular Avatar has compiler errors in a newly created project
+
+## [1.12.0] - [2025-04-01]
+
+### Fixed
+- [#1531] Fix compatibility issue with lylicalInventory
+
+### Changed
+- [#1530] `MA Menu Item` auto parameters now also assign names based on object paths
+
+## [1.12.0-rc.1] - [2025-03-28]
+
+### Added
+- [#1524] Added support for disabling MMD world handling at an avatar level
+
+### Fixed
+- [#1522] `Convert Constraints` failed to convert animation references
+- [#1528] `Merge Animator` ignored the `Match Avatar Write Defaults` setting and always matched
+
+### Changed
+- [#1529] `MA Parameters` auto-rename now assigns new names based on the path of the object. This should improve
+  compatibility with `MA Sync Parameter Sequence`
+  - If you are using `MA Sync Parameter Sequence`, it's a good idea to empty your SyncedParams asset and reupload all
+    platforms after updating to this version.
+
+## [1.12.0-rc.0] - [2025-03-22]
+
+### Fixed
+- [#1508] Fix an issue where automatic compression of expressions menu icons would fail when the texture dimensions were
+  not divisible by four.
+- [#1513] Expression menu icon compression broke on iOS builds
+
+### Changed
+- [#1514] `Merge Blend Tree` is now `Merge Motion (Blend Tree)` and supports merging animation clips as well as blend trees
+
 ## [1.12.0-beta.0] - [2025-03-17]

 ### Added
--- a/CHANGELOG-jp.md
+++ b/CHANGELOG-jp.md
@ -8,6 +8,54 @@ Modular Avatarの主な変更点をこのファイルで記録しています。

 ## [Unreleased]

+### Added
+- (実験的機能) VRC以外のプラットフォームのサポートを有効化
+
+### Fixed
+
+### Changed
+
+### Removed
+
+### Security
+
+### Deprecated
+
+## [1.12.4] - [2025-04-10]
+
+### Fixed
+- [#1552] Merge Blend Treeにて、メインアバターFXレイヤーと同じ名前のintやboolパラメーターがBlend Treeに含まれている場合、
+  パラメーター型が修正されない問題を修正
+- [#1553] リアクティブコンポーネントが生成するステートに、WD設定が正しくない問題を修正
+
+### Changed
+- [#1551] Merge Animatorは、遷移のない単一のstateを持つブレンドツリーのレイヤーに対して常にWDをONに設定します。
+  - 一部、以前の挙動に依存したアセットとの互換性を向上させるための変更です。
+
+## [1.12.3] - [2025-04-05]
+
+### Fixed
+- Additiveレイヤーの問題を修正（NDMFバージョンアップグレードによって修正）
+
+### Changed
+- [#1542] Merge Animatorは、アニメーションクリップを含む単一のstateを持つレイヤーに対してWD設定を一致させるが、
+　    ブレンドツリーを含む場合は一致させないように変更されました。
+  - これにより、1.12で導入された互換性の問題が修正されます（1.12.0では、単一のstateアニメーションクリップに対してWD設定
+    と一致しないように変更されました）。
+
+## [1.12.2] - [2025-04-03]
+
+### Fixed
+- [#1537] アニメーターパラメーターをアニメーションさせるカーブが、`Merge Motion` コンポーネントを使用して追加された場合、
+  `Rename Parameters` によって更新されない問題を修正``
+
+## [1.12.1] - [2025-04-02]
+
+### Fixed
+- [#1532] Modular Avatarが新しく作成したプロジェクトでコンパイラエラーを出す問題を修正
+
+## [1.12.0] - [2025-04-01]
+
 ### Added
 - CHANGELOGファイルを追加
 - [#1482] `Merge Animator` に既存のアニメーターコントローラーを置き換える機能を追加
@ -17,13 +65,21 @@ Modular Avatarの主な変更点をこのファイルで記録しています。
 ### Fixed
 - [#1460] パラメーターアセットをMA Parametersにインポートするとき、ローカルのみのパラメーターが間違ってアニメーターのみ扱いになる問題を修正
 - [#1489] `Merge Blend Tree` やリアクティブコンポーネントとMMDワールドの互換性の問題を修正。
-  詳細は[ドキュメント](https://modular-avatar.nadena.dev/docs/general-behavior/mmd)を参照してください。
+  - 詳細は[ドキュメント](https://modular-avatar.nadena.dev/docs/general-behavior/mmd)を参照してください。
+  - この動作を無効にするには、新しい `MA VRChat Settings` コンポーネントをアバターの適当なところに追加して、適切な設定を無効にしてください。
 - [#1501] MA Parametersコンポーネントのテキスト入力欄を編集する際にUnityのキーボードショートカットが機能しない問題を修正
 - [#1410] 同期レイヤー内のモーションオーバーライドがBone Proxy/Merge Armatureオブジェクトの移動に対して更新されない問題を修正
 - [#1504] 一部の状況で内部の`DelayDisable`レイヤーが不要なオブジェクトを参照しないように変更
  - これにより、オブジェクトがアニメーションされているかどうかを追跡するAAOなどのツールとの互換性が向上します
+- [#1508] テクスチャのサイズが4の倍数でない場合に、エクスプレッションメニューアイコンの自動圧縮が失敗する問題を修正
+- [#1513] iOSビルドでエクスプレッションメニューアイコンの圧縮処理が壊れる問題を修正

 ### Changed
+- [#1529] `MA Parameters` の自動リネームと `MA Menu Item` の自動パラメーター機能は、オブジェクトのパスに基づいて名前
+  を割り当てるように変更されました。
+  - `MA Sync Parameter Sequence` を使用している場合は、このバージョンに更新した後、SyncedParamsアセットを空にして、
+    すべてのプラットフォームを再アップロードすることをお勧めします。
+- [#1514] `Merge Blend Tree` は `Merge Motion (Blend Tree)` に改名され、アニメーションクリップにも対応するようになりました
 - [#1476] ModularAvatarMergeAnimator と ModularAvatarMergeParameter を新しい NDMF API (`IVirtualizeMotion` と `IVirtualizeAnimatorController`) を使用するように変更
 - [#1483] Merge Animator の 「アバターの Write Defaults 設定に合わせる」設定では、Additiveなレイヤー、および単一Stateかつ遷移のないレイヤー
 　に対してはWrite Defaultsを調整しないように変更。
@ -34,12 +90,6 @@ Modular Avatarの主な変更点をこのファイルで記録しています。
    アニメーションがブロックされたときにオーディオソースを無効にするように変更。
 - [#1502] `World Fixed Object` は `VRCParentConstraint` を使用するようになり、Androidビルドで使用可能になりました。

-### Removed
-
-### Security
-
-### Deprecated
-
 ## それより前

 GitHubのリリースページをご確認ください: https://github.com/bdunderscore/modular-avatar/releases
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -10,6 +10,54 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

 ## [Unreleased]

+### Added
+- (Experimental feature) Enabled support for non-VRC platforms
+
+### Fixed
+
+### Changed
+
+### Removed
+
+### Security
+
+### Deprecated
+
+## [1.12.4] - [2025-04-10]
+
+### Fixed
+- [#1552] Merge Blend Tree failed to correct parameter types when the main avatar FX layer contained an int or bool
+  parameter with the same name as one used in the blend tree.
+- [#1553] Reactive components might generate states with incorrect write default settings
+
+### Changed
+- [#1551] Merge Animator will always set WD ON for single-state blendtree layers with no any state transitions.
+  - This fixes compatibility issues with assets which relied on the prior behavior.
+
+## [1.12.3] - [2025-04-05]
+
+### Fixed
+- Fixed issues with additive layers (via NDMF version upgrade)
+
+### Changed
+- [#1542] Merge Animator now will match WD settings for layers with a single state containing an animation clip,
+  but not if it contains a blend tree. This fixes some compatibility issues introduced in 1.12 (where the behavior
+  was changed to not match WD settings for single-state animation clips).
+- [#1551] Merge Animator will always set WD ON for single-state blendtree layers with no any state transitions.
+
+## [1.12.2] - [2025-04-03]
+
+### Fixed
+- [#1537] Curves which animated animator parameters, when added using a `Merge Motion` component, would not be updated by
+  `Rename Parameters`
+
+## [1.12.1] - [2025-04-02]
+
+### Fixed
+- [#1532] Modular Avatar has compiler errors in a newly created project
+
+## [1.12.0] - [2025-04-01]
+
 ### Added
 - Added CHANGELOG files
 - [#1482] Added support for replacing pre-existing animator controllers to `Merge Animator`
@ -20,13 +68,22 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - [#1460] When importing parameter assets in MA Parameters, "local only" parameters were incorrectly treated as
  "animator only"
 - [#1489] Fixed compatibility issues between `Merge Blend Tree` or reactive components and MMD worlds.
-  See [documentation](https://modular-avatar.nadena.dev/docs/general-behavior/mmd) for details on the new handling. 
+  - See [documentation](https://modular-avatar.nadena.dev/docs/general-behavior/mmd) for details on the new handling.
+  - To disable this behavior, attach the new `MA VRChat Settings` component to any object on your avatar and disable the appropriate setting.
 - [#1501] Unity keyboard shortcuts don't work when editing text fields on the MA Parameters component 
 - [#1410] Motion overrides on synced layers are not updated for Bone Proxy/Merge Armature object movement
 - [#1504] The internal `DelayDisable` layer no longer references unnecessary objects in some situations
  - This helps improve compatibility with AAO and other tools that track whether objects are animated 
+- [#1508] Fix an issue where automatic compression of expressions menu icons would fail when the texture dimensions were
+  not divisible by four.
+- [#1513] Expression menu icon compression broke on iOS builds

 ### Changed
+- [#1529] `MA Parameters` auto-rename and `MA Menu Item`'s automatic parameter feature now assign names based on the
+  path of the object. This should improve compatibility with `MA Sync Parameter Sequence`
+  - If you are using `MA Sync Parameter Sequence`, it's a good idea to empty your SyncedParams asset and reupload all
+    platforms after updating to this version.
+- [#1514] `Merge Blend Tree` is now `Merge Motion (Blend Tree)` and supports merging animation clips as well as blend trees
 - [#1476] Switch ModularAvatarMergeAnimator and ModularAvatarMergeParameter to use new NDMF APIs (`IVirtualizeMotion` and `IVirtualizeAnimatorController`)
 - [#1483] The Merge Animator "Match Avatar Write Defaults" option will no longer adjust write defaults on states in
  additive layers, or layers with only one state and no transitions.
@ -37,12 +94,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
  to avoid it unintentionally being constantly active.
 - [#1502] `World Fixed Object` now uses `VRCParentConstraint` and is therefore compatible with Android builds 

-### Removed
-
-### Security
-
-### Deprecated
-
 ## Older versions

 Please see the github releases page at https://github.com/bdunderscore/modular-avatar/releases
--- a/Editor/Animation/MMDRelayPass.cs
+++ b/Editor/Animation/MMDRelayPass.cs
@ -23,10 +23,13 @@ namespace nadena.dev.modular_avatar.animation
        internal HashSet<VirtualLayer> mmdAffectedOriginalLayers = new();
    }

+    [RunsOnPlatforms(WellKnownPlatforms.VRChatAvatar30)]
    internal class MMDRelayEarlyPass : Pass<MMDRelayEarlyPass>
    {
        protected override void Execute(BuildContext context)
        {
+            if (!MMDRelayPass.ShouldRun(context)) return;
+            
            var asc = context.Extension<AnimatorServicesContext>();
            if (asc.ControllerContext.Controllers.TryGetValue(VRCAvatarDescriptor.AnimLayerType.FX, out var fx))
            {
@ -44,6 +47,7 @@ namespace nadena.dev.modular_avatar.animation
    ///     layer to relay this to layers which should be affected. Finally, any layer which _shouldn't_ be affected is
    ///     pushed out of the first three layers by injecting dummy layers.
    /// </summary>
+    [RunsOnPlatforms(WellKnownPlatforms.VRChatAvatar30)]
    internal class MMDRelayPass : Pass<MMDRelayPass>
    {
        private const string MMDRelayParam = "__MA/Internal/MMDNotActive";
@ -53,8 +57,16 @@ namespace nadena.dev.modular_avatar.animation
        internal const string StateNameNotMMD = "NotMMD";
        internal const string StateNameMMD = "MMD";

+        internal static bool ShouldRun(BuildContext context)
+        {
+            var settings = context.AvatarRootObject.GetComponentsInChildren<ModularAvatarVRChatSettings>(true);
+            return settings.FirstOrDefault()?.MMDWorldSupport ?? true;
+        }
+        
        protected override void Execute(BuildContext context)
        {
+            if (!ShouldRun(context)) return;
+            
            var asc = context.Extension<AnimatorServicesContext>();
            if (!asc.ControllerContext.Controllers.TryGetValue(VRCAvatarDescriptor.AnimLayerType.FX, out var fx))
                return;
@ -63,10 +75,12 @@ namespace nadena.dev.modular_avatar.animation

            foreach (var layer in fx.Layers)
            {
+                if (layer.StateMachine == null) continue;
+                
                var rootMMDModeBehaviors = layer.StateMachine.Behaviours
                    .OfType<ModularAvatarMMDLayerControl>()
                    .ToList();
-
+                
                if (rootMMDModeBehaviors.Count == 0) continue;
                if (rootMMDModeBehaviors.Count > 1)
                {
--- a/Editor/ApplyAnimatorDefaultValuesPass.cs
+++ b/Editor/ApplyAnimatorDefaultValuesPass.cs
@ -13,6 +13,7 @@ using UnityEngine;

 namespace nadena.dev.modular_avatar.core.editor
 {
+    [RunsOnPlatforms(WellKnownPlatforms.VRChatAvatar30)]
    internal class ApplyAnimatorDefaultValuesPass : Pass<ApplyAnimatorDefaultValuesPass>
    {
        protected override void Execute(ndmf.BuildContext context)
--- a/Editor/FixupPasses/FixupExpressionsMenuPass.cs
+++ b/Editor/FixupPasses/FixupExpressionsMenuPass.cs
@ -6,7 +6,6 @@ using System.Collections.Immutable;
 using System.Linq;
 using UnityEditor;
 using UnityEngine;
-using UnityEngine.Experimental.Rendering;
 using VRC.SDK3.Avatars.ScriptableObjects;
 using Object = UnityEngine.Object;

@ -44,7 +43,7 @@ namespace nadena.dev.modular_avatar.core.editor
            }

            var parameters = context.AvatarDescriptor.expressionParameters.parameters
-                             ?? new VRCExpressionParameters.Parameter[0];
+                             ?? Array.Empty<VRCExpressionParameters.Parameter>();
            var parameterNames = parameters.Select(p => p.name).ToImmutableHashSet();

            if (!context.PluginBuildContext.IsTemporaryAsset(expressionsMenu))
@ -120,11 +119,20 @@ namespace nadena.dev.modular_avatar.core.editor
            }
        }

-#if UNITY_ANDROID
-        private const TextureFormat TargetFormat = TextureFormat.ASTC_4x4;
-#else
-        private const TextureFormat TargetFormat = TextureFormat.DXT5;
-#endif
+        internal static TextureFormat TargetFormat
+        {
+            get
+            {
+                switch (EditorUserBuildSettings.activeBuildTarget)
+                {
+                    case BuildTarget.StandaloneWindows64:
+                        return TextureFormat.DXT5;
+                    default:
+                        return TextureFormat.ASTC_4x4;
+                }
+            }
+        }
+        

        private static Texture2D MaybeScaleIcon(BuildContext context, Texture2D original)
        {
@ -133,10 +141,14 @@ namespace nadena.dev.modular_avatar.core.editor
                return original;
            }

-            var newRatio = Math.Min(256f / original.width, 256f / original.height);
+            var newRatio = Math.Min(1, Math.Min(256f / original.width, 256f / original.height));
            var newWidth = Math.Min(256, Mathf.RoundToInt(original.width * newRatio));
            var newHeight = Math.Min(256, Mathf.RoundToInt(original.height * newRatio));

+            // Round up to a multiple of four
+            newWidth = (newWidth + 3) & ~3;
+            newHeight = (newHeight + 3) & ~3;
+
            var newTex = new Texture2D(newWidth, newHeight, TextureFormat.RGBA32, true);
            context.SaveAsset(newTex);

--- a/Editor/Inspector/MergeBlendTreeEditor.cs
+++ b/Editor/Inspector/MergeBlendTreeEditor.cs
@ -1,7 +1,7 @@
 #if MA_VRCSDK3_AVATARS

 using UnityEditor;
-using UnityEditor.Animations;
+using UnityEngine;
 using static nadena.dev.modular_avatar.core.editor.Localization;

 namespace nadena.dev.modular_avatar.core.editor
@ -15,7 +15,9 @@ namespace nadena.dev.modular_avatar.core.editor
        
        private void OnEnable()
        {
+#pragma warning disable CS0618 // Type or member is obsolete
            _blendTree = serializedObject.FindProperty(nameof(ModularAvatarMergeBlendTree.BlendTree));
+#pragma warning restore CS0618 // Type or member is obsolete
            _pathMode = serializedObject.FindProperty(nameof(ModularAvatarMergeBlendTree.PathMode));
            _relativePathRoot = serializedObject.FindProperty(nameof(ModularAvatarMergeBlendTree.RelativePathRoot));
        }
@ -24,7 +26,7 @@ namespace nadena.dev.modular_avatar.core.editor
        {
            serializedObject.Update();

-            EditorGUILayout.ObjectField(_blendTree, typeof(BlendTree), G("merge_blend_tree.blend_tree"));
+            EditorGUILayout.ObjectField(_blendTree, typeof(Motion), G("merge_blend_tree.motion"));
            EditorGUILayout.PropertyField(_pathMode, G("merge_blend_tree.path_mode"));
            if (_pathMode.enumValueIndex == (int) MergeAnimatorPathMode.Relative)
            {
--- a/Editor/Inspector/vrchat.meta
+++ b/Editor/Inspector/vrchat.meta
@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: d59587969bdd48f4ba16883ee3b30d4d
+timeCreated: 1742695977
--- a/Editor/Inspector/vrchat/VRChatSettingsEditor.cs
+++ b/Editor/Inspector/vrchat/VRChatSettingsEditor.cs
@ -0,0 +1,27 @@
+using UnityEditor;
+
+namespace nadena.dev.modular_avatar.core.editor
+{
+    [CustomEditor(typeof(ModularAvatarVRChatSettings))]
+    internal class VRChatSettingsEditor : MAEditorBase
+    {
+        protected override void OnInnerInspectorGUI()
+        {
+            serializedObject.Update();
+
+            EditorGUI.BeginChangeCheck();
+
+            EditorGUILayout.PropertyField(
+                serializedObject.FindProperty(nameof(ModularAvatarVRChatSettings.m_mmdWorldSupport)),
+                Localization.G("platform.vrchat.settings.mmd_world_support")
+            );
+
+            if (EditorGUI.EndChangeCheck())
+            {
+                serializedObject.ApplyModifiedProperties();
+            }
+
+            Localization.ShowLanguageUI();
+        }
+    }
+}
--- a/Editor/Inspector/vrchat/VRChatSettingsEditor.cs.meta
+++ b/Editor/Inspector/vrchat/VRChatSettingsEditor.cs.meta
@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 1ffd87033f4d441b849ad147b6e2a6ef
+timeCreated: 1742695986
--- a/Editor/Localization/en-US.json
+++ b/Editor/Localization/en-US.json
@ -96,7 +96,7 @@
  "merge_armature.reset_pos.execute": "Do it!",
  "merge_armature.reset_pos.heuristic_scale": "Adjust outfit overall scale to match base avatar",
  "merge_armature.reset_pos.heuristic_scale.tooltip": "Will set the overall scale of the outfit as a whole based on armspan measurements. Recommended for setting up outfits.",
-  "merge_blend_tree.blend_tree": "Blend Tree",
+  "merge_blend_tree.motion": "Motion (or Blend Tree) to merge",
  "merge_blend_tree.path_mode": "Path Mode",
  "merge_blend_tree.path_mode.tooltip": "How to interpret paths in animations. Using relative mode lets you record animations from an animator on this object.",
  "merge_blend_tree.relative_path_root": "Relative Path Root",
@ -304,6 +304,7 @@
  "sync-param-sequence.parameters": "Common parameters asset",
  "sync-param-sequence.parameters.tooltip": "The asset to store common parameters in. Do not use the same Expression Parameters that you have set in your avatar descriptor.",
  "sync-param-sequence.create-asset": "New",
-  "sync-param-sequence.create-asset.tooltip": "Creates a new expression parameters asset"
+  "sync-param-sequence.create-asset.tooltip": "Creates a new expression parameters asset",
+  "platform.vrchat.settings.mmd_world_support": "MMD world support"

 }
--- a/Editor/Localization/ja-JP.json
+++ b/Editor/Localization/ja-JP.json
@ -92,7 +92,7 @@
  "merge_armature.reset_pos.execute": "実行",
  "merge_armature.reset_pos.heuristic_scale": "衣装の全体的なスケールをアバターに合わせる",
  "merge_armature.reset_pos.heuristic_scale.tooltip": "腕の長さを参考に、衣装全体のスケールをアバターに合わせます。非対応衣装を導入する時にお勧めです。",
-  "merge_blend_tree.blend_tree": "ブレンドツリー",
+  "merge_blend_tree.motion": "結合するモーション（またはブレンドツリー）",
  "merge_blend_tree.path_mode": "パスモード",
  "merge_blend_tree.path_mode.tooltip": "アニメーション内のパスを解釈するモード。相対的にすると、このオブジェクトにつけたアニメーターでアニメーションを編集することができます。",
  "merge_blend_tree.relative_path_root": "相対的パスのルート",
@ -294,5 +294,6 @@
  "sync-param-sequence.parameters": "共用パラメーターアセット",
  "sync-param-sequence.parameters.tooltip": "共用パラメーターがこのアセットに保持されます。アバターデスクリプターに使われるアセットを流用しないでください。",
  "sync-param-sequence.create-asset": "新規作成",
-  "sync-param-sequence.create-asset.tooltip": "新しい共用パラメーターアセットを作成します"
+  "sync-param-sequence.create-asset.tooltip": "新しい共用パラメーターアセットを作成します",
+  "platform.vrchat.settings.mmd_world_support": "MMDワールド対応"
 }
--- a/Editor/Localization/ko-KR.json
+++ b/Editor/Localization/ko-KR.json
@ -88,7 +88,6 @@
  "merge_armature.reset_pos.execute": "실행",
  "merge_armature.reset_pos.heuristic_scale": "의상의 전체적인 스케일을 원본 아바타에 맞춤",
  "merge_armature.reset_pos.heuristic_scale.tooltip": "원본 아바타의 팔 길이를 참조하여, 의상의 전체 스케일을 이에 맞춥니다. 전용 의상이 아닌 경우 도움이 됩니다.",
-  "merge_blend_tree.blend_tree": "블랜드 트리",
  "merge_blend_tree.path_mode": "경로 모드",
  "merge_blend_tree.path_mode.tooltip": "애니메이션에서 경로를 해석하는 방법에 대해 설명합니다. 상대 모드를 사용하면 이 오브젝트의 애니메이터에서 애니메이션을 기록할 수 있습니다.",
  "merge_blend_tree.relative_path_root": "상대적 경로",
--- a/Editor/Localization/zh-Hans.json
+++ b/Editor/Localization/zh-Hans.json
@ -93,7 +93,6 @@
  "merge_armature.reset_pos.execute": "执行！",
  "merge_armature.reset_pos.heuristic_scale": "根据 Avatar 调整服装的整体比例",
  "merge_armature.reset_pos.heuristic_scale.tooltip": "以臂展作为参考，调整服装的整体比例。\n推荐用于不适配当前 Avatar 的服装。",
-  "merge_blend_tree.blend_tree": "BlendTree",
  "merge_blend_tree.path_mode": "路径模式",
  "merge_blend_tree.path_mode.tooltip": "在动画中路径的工作模式。\n使用相对路径可以让你在当前对象上录制动画。",
  "merge_blend_tree.relative_path_root": "相对路径根对象",
--- a/Editor/Localization/zh-Hant.json
+++ b/Editor/Localization/zh-Hant.json
@ -93,7 +93,6 @@
  "merge_armature.reset_pos.execute": "執行",
  "merge_armature.reset_pos.heuristic_scale": "根據 Avatar 調整服裝的整體比例",
  "merge_armature.reset_pos.heuristic_scale.tooltip": "以臂展作為參考，調整服裝的整體比例。\n推薦用於非 Avatar 對應的服裝。",
-  "merge_blend_tree.blend_tree": "Blend Tree",
  "merge_blend_tree.path_mode": "路徑模式",
  "merge_blend_tree.path_mode.tooltip": "在動畫中路徑的工作模式。\n使用相對路徑可以讓你在當前物件上錄制動畫。",
  "merge_blend_tree.relative_path_root": "相對路徑根物件",
--- a/Editor/MergeAnimatorProcessor.cs
+++ b/Editor/MergeAnimatorProcessor.cs
@ -114,19 +114,27 @@ namespace nadena.dev.modular_avatar.core.editor
                // We'll now continue processing the rest as normal.
            }

+            var writeDefaults = AnalyzeLayerWriteDefaults(controller);
+
+            foreach (var component in sorted)
+            {
+                MergeSingle(context, controller, component, writeDefaults);
+            }
+        }
+
+        internal static bool? AnalyzeLayerWriteDefaults(VirtualAnimatorController controller)
+        {
            bool? writeDefaults = null;
-            
-            var wdStateCounter = controller.Layers.SelectMany(l => l.StateMachine.AllStates())
+
+            var wdStateCounter = controller.Layers
+                .Where(l => !IsWriteDefaultsSafeLayer(l))
+                .SelectMany(l => l.StateMachine.AllStates())
                .Select(s => s.WriteDefaultValues)
                .GroupBy(b => b)
                .ToDictionary(g => g.Key, g => g.Count());

            if (wdStateCounter.Count == 1) writeDefaults = wdStateCounter.First().Key;
-            
-            foreach (var component in sorted)
-            {
-                MergeSingle(context, controller, component, writeDefaults);
-            }
+            return writeDefaults;
        }

        private void MergeSingle(BuildContext context, VirtualAnimatorController targetController,
@ -137,6 +145,11 @@ namespace nadena.dev.modular_avatar.core.editor
                return;
            }

+            if (!merge.matchAvatarWriteDefaults)
+            {
+                initialWriteDefaults = null;
+            }
+            
            var vac = context.PluginBuildContext.Extension<VirtualControllerContext>();

            if (!vac.Controllers.TryGetValue(merge, out var clonedController)) return;
@ -155,6 +168,15 @@ namespace nadena.dev.modular_avatar.core.editor
                    }
                }

+                if (l.StateMachine?.DefaultState?.Motion is VirtualBlendTree
+                    && l.StateMachine.States.Count == 1
+                    && l.StateMachine.StateMachines.Count == 0
+                    && l.StateMachine.AnyStateTransitions.Count == 0)
+                {
+                    // Force WD on for single state blendtree layers
+                    l.StateMachine.DefaultState.WriteDefaultValues = true;
+                }
+                
                targetController.AddLayer(new LayerPriority(merge.layerPriority), l);
            }

@ -194,14 +216,14 @@ namespace nadena.dev.modular_avatar.core.editor
            Object.DestroyImmediate(merge);
        }

-        private bool IsWriteDefaultsSafeLayer(VirtualLayer virtualLayer)
+        private static bool IsWriteDefaultsSafeLayer(VirtualLayer virtualLayer)
        {
            if (virtualLayer.BlendingMode == AnimatorLayerBlendingMode.Additive) return true;
            var sm = virtualLayer.StateMachine;

            if (sm.StateMachines.Count != 0) return false;
            return sm.States.Count == 1 && sm.AnyStateTransitions.Count == 0 &&
-                   sm.DefaultState.Transitions.Count == 0;
+                   sm.DefaultState?.Transitions.Count == 0 && sm.DefaultState.Motion is VirtualBlendTree;
        }
    }
 }
--- a/Editor/MergeBlendTreePass.cs
+++ b/Editor/MergeBlendTreePass.cs
@ -2,6 +2,7 @@

 #region

+using System;
 using System.Collections.Generic;
 using nadena.dev.ndmf;
 using nadena.dev.ndmf.animator;
@ -9,11 +10,13 @@ using UnityEditor;
 using UnityEditor.Animations;
 using UnityEngine;
 using VRC.SDK3.Avatars.Components;
+using Object = UnityEngine.Object;

 #endregion

 namespace nadena.dev.modular_avatar.core.editor
 {
+    [RunsOnPlatforms(WellKnownPlatforms.VRChatAvatar30)]
    internal class MergeBlendTreePass : Pass<MergeBlendTreePass>
    {
        internal const string ALWAYS_ONE = "__ModularAvatarInternal/One";
@ -62,14 +65,31 @@ namespace nadena.dev.modular_avatar.core.editor

            foreach (var name in _parameterNames)
            {
-                if (fx.Parameters.ContainsKey(name)) continue;
-                
-                fx.Parameters = fx.Parameters.SetItem(name, new AnimatorControllerParameter()
+                if (fx.Parameters.TryGetValue(name, out var existingParameter))
                {
-                    name = name,
-                    type = AnimatorControllerParameterType.Float,
-                    defaultFloat = 0.0f
-                });
+                    switch (existingParameter.type)
+                    {
+                        case AnimatorControllerParameterType.Bool:
+                            existingParameter.defaultFloat = existingParameter.defaultBool ? 1 : 0;
+                            break;
+                        case AnimatorControllerParameterType.Int:
+                            existingParameter.defaultFloat = existingParameter.defaultInt;
+                            break;
+                    }
+
+                    existingParameter.type = AnimatorControllerParameterType.Float;
+                }
+                else
+                {
+                    existingParameter = new AnimatorControllerParameter
+                    {
+                        name = name,
+                        type = AnimatorControllerParameterType.Float,
+                        defaultFloat = 0.0f
+                    };
+                }
+
+                fx.Parameters = fx.Parameters.SetItem(name, existingParameter);
            }
        }

@ -83,8 +103,6 @@ namespace nadena.dev.modular_avatar.core.editor
                return;
            }

-            string basePath = null;
-            
            var rootBlend = GetRootBlendTree();
            
            rootBlend.Children = rootBlend.Children.Add(new()
@ -136,6 +154,10 @@ namespace nadena.dev.modular_avatar.core.editor
            var fx = _asc.ControllerContext.Controllers[VRCAvatarDescriptor.AnimLayerType.FX];
            var controller = fx.AddLayer(new LayerPriority(int.MinValue), BlendTreeLayerName);
            var stateMachine = controller.StateMachine;
+            if (fx == null)
+            {
+                throw new Exception("FX layer not found");
+            }
            
            _rootBlendTree = VirtualBlendTree.Create("Root");
            var state = stateMachine.AddState("State", _rootBlendTree);
--- a/Editor/MiscPreview/RemoveVertexColorPreview.cs
+++ b/Editor/MiscPreview/RemoveVertexColorPreview.cs
@ -89,8 +89,8 @@ namespace nadena.dev.modular_avatar.core.editor
            public Task<IRenderFilterNode> Refresh(IEnumerable<(Renderer, Renderer)> proxyPairs, ComputeContext context,
                RenderAspects updatedAspects)
            {
-                if (updatedAspects.HasFlag(RenderAspects.Mesh)) return Task.FromResult<IRenderFilterNode>(null);
-                if (_theMesh == null) return Task.FromResult<IRenderFilterNode>(null);
+                if (updatedAspects.HasFlag(RenderAspects.Mesh)) return Task.FromResult<IRenderFilterNode>(null!);
+                if (_theMesh == null) return Task.FromResult<IRenderFilterNode>(null!);

                return Task.FromResult<IRenderFilterNode>(this);
            }
--- a/Editor/OptimizationPasses/ConstraintConverterPass.cs
+++ b/Editor/OptimizationPasses/ConstraintConverterPass.cs
@ -14,6 +14,7 @@ using VRC.Dynamics;

 namespace nadena.dev.modular_avatar.core.editor
 {
+    [RunsOnPlatforms(WellKnownPlatforms.VRChatAvatar30)]
    internal class ConstraintConverterPass : Pass<ConstraintConverterPass>
    {
 #if MA_VRCSDK3_AVATARS_3_7_0_OR_NEWER
@ -52,13 +53,14 @@ namespace nadena.dev.modular_avatar.core.editor

            var constraintGameObjects = context.AvatarRootObject.GetComponentsInChildren<IConstraint>(true)
                .Select(c => (c as Component)?.gameObject)
+                .Where(go => go != null)
                .Distinct()
-                .Where(go => go.GetComponentsInParent<ModularAvatarConvertConstraints>(true)
+                .Where(go => go!.GetComponentsInParent<ModularAvatarConvertConstraints>(true)
                    .Select(c => c.gameObject)
                    .Any(converters.Contains)
                ).ToArray();
            var targetConstraintComponents =
-                constraintGameObjects.SelectMany(go => go.GetComponents<IConstraint>()).ToArray();
+                constraintGameObjects.SelectMany(go => go!.GetComponents<IConstraint>()).ToArray();

            AvatarDynamicsSetup.DoConvertUnityConstraints(targetConstraintComponents, null, false);

@ -72,7 +74,7 @@ namespace nadena.dev.modular_avatar.core.editor

            var targetPaths = constraintGameObjects
                .Union(existingVRCConstraints)
-                .Select(c => asc.ObjectPathRemapper.GetVirtualPathForObject(c))
+                .Select(c => asc.ObjectPathRemapper.GetVirtualPathForObject(c!))
                .ToHashSet();

            // Update animation clips
@ -102,7 +104,7 @@ namespace nadena.dev.modular_avatar.core.editor
                        };
                        var curve = clip.GetFloatCurve(ecb);
                        clip.SetFloatCurve(newBinding, curve);
-                        clip.SetFloatCurve(newBinding, null);
+                        clip.SetFloatCurve(ecb, null);
                    }
            }
        }
--- a/Editor/OptimizationPasses/PruneParametersPass.cs
+++ b/Editor/OptimizationPasses/PruneParametersPass.cs
@ -5,6 +5,7 @@ using nadena.dev.ndmf;

 namespace nadena.dev.modular_avatar.core.editor
 {
+    [RunsOnPlatforms(WellKnownPlatforms.VRChatAvatar30)]
    internal class PruneParametersPass : Pass<PruneParametersPass>
    {
        protected override void Execute(ndmf.BuildContext context)
--- a/Editor/ParameterPolicy.cs
+++ b/Editor/ParameterPolicy.cs
@ -156,7 +156,7 @@ namespace nadena.dev.modular_avatar.core.editor

                    case ModularAvatarMergeBlendTree mergeBlendTree:
                    {
-                        WalkBlendTree(parameters, mergeBlendTree.BlendTree as BlendTree);
+                        WalkBlendTree(parameters, mergeBlendTree.Motion as BlendTree);
                        break;
                    }

--- a/Editor/PluginDefinition/PluginDefinition.cs
+++ b/Editor/PluginDefinition/PluginDefinition.cs
@ -7,6 +7,7 @@ using nadena.dev.modular_avatar.editor.ErrorReporting;
 using nadena.dev.ndmf;
 using nadena.dev.ndmf.animator;
 using nadena.dev.ndmf.fluent;
+using nadena.dev.ndmf.model;
 using nadena.dev.ndmf.util;
 using UnityEngine;
 using Object = UnityEngine.Object;
@ -19,6 +20,7 @@ using Object = UnityEngine.Object;

 namespace nadena.dev.modular_avatar.core.editor.plugin
 {
+    [RunsOnAllPlatforms]
    class PluginDefinition : Plugin<PluginDefinition>
    {
        public override string QualifiedName => "nadena.dev.modular-avatar";
@ -38,19 +40,27 @@ namespace nadena.dev.modular_avatar.core.editor.plugin
            Sequence seq = InPhase(BuildPhase.Resolving);
            seq.Run(ResolveObjectReferences.Instance);

+            // Protect against accidental destructive edits by cloning the input controllers ASAP
+            seq.WithRequiredExtension(typeof(AnimatorServicesContext), s =>
+            {
+                // Just activating the context is enough.
+                s.Run("Clone animators", _ => { });
+            });
+
            seq = InPhase(BuildPhase.Transforming);
            seq.Run("Validate configuration",
                context => ComponentValidation.ValidateAll(context.AvatarRootObject));
            seq.WithRequiredExtension(typeof(ModularAvatarContext), _s1 =>
            {
                seq.Run(ClearEditorOnlyTags.Instance);
+                seq.Run(VRChatSettingsPass.Instance);
                seq.Run(MeshSettingsPluginPass.Instance);
                seq.Run(ScaleAdjusterPass.Instance).PreviewingWith(new ScaleAdjusterPreview());
                
-                // All these need to move to the new ASC
 #if MA_VRCSDK3_AVATARS
                seq.Run(ReactiveObjectPrepass.Instance);
 #endif
+                
                seq.WithRequiredExtension(typeof(AnimatorServicesContext), _s2 =>
                {
 #if MA_VRCSDK3_AVATARS
@ -63,7 +73,8 @@ namespace nadena.dev.modular_avatar.core.editor.plugin

                    seq.WithRequiredExtension(typeof(ReadablePropertyExtension), _s3 =>
                    {
-                        seq.Run("Shape Changer", ctx => new ReactiveObjectPass(ctx).Execute())
+                        // TODO - refactor out VRChat-specific bits
+                        seq.Run("Reactive Components", ctx => new ReactiveObjectPass(ctx).Execute())
                            .PreviewingWith(new ShapeChangerPreview(), new ObjectSwitcherPreview(),
                                new MaterialSetterPreview());
                    });
@ -75,26 +86,27 @@ namespace nadena.dev.modular_avatar.core.editor.plugin
                    seq.Run(MenuInstallPluginPass.Instance);
 #endif
                    seq.Run(MergeArmaturePluginPass.Instance);
-
                    seq.Run(BoneProxyPluginPass.Instance);
                    
 #if MA_VRCSDK3_AVATARS
                    seq.Run(VisibleHeadAccessoryPluginPass.Instance);
 #endif
-                    
-                    seq.Run("World Fixed Object",
-                        ctx => new WorldFixedObjectProcessor().Process(ctx)
-                    );
+
+                    seq.OnPlatforms(new[] { WellKnownPlatforms.VRChatAvatar30 }, _seq =>
+                    {
+                        seq.Run("World Fixed Object",
+                            ctx => new WorldFixedObjectProcessor().Process(ctx)
+                        );
+                    });
                    seq.Run(WorldScaleObjectPass.Instance);
-                    
+
                    seq.Run(ReplaceObjectPluginPass.Instance);
                    
 #if MA_VRCSDK3_AVATARS
                    seq.Run(BlendshapeSyncAnimationPluginPass.Instance);
+                    seq.Run(ConstraintConverterPass.Instance);
 #endif
                    
-                    seq.Run(ConstraintConverterPass.Instance);
-
                    seq.Run("Prune empty animator layers",
                        ctx => { ctx.Extension<AnimatorServicesContext>().RemoveEmptyLayers(); });
                    seq.Run("Harmonize animator parameter types",
@ -104,10 +116,13 @@ namespace nadena.dev.modular_avatar.core.editor.plugin
                });
 #if MA_VRCSDK3_AVATARS
                seq.Run(PhysbonesBlockerPluginPass.Instance);
-                seq.Run("Fixup Expressions Menu", ctx =>
+                seq.OnPlatforms(new[] { WellKnownPlatforms.VRChatAvatar30 }, _seq =>
                {
-                    var maContext = ctx.Extension<ModularAvatarContext>().BuildContext;
-                    FixupExpressionsMenuPass.FixupExpressionsMenu(maContext);
+                    seq.Run("Fixup Expressions Menu", ctx =>
+                    {
+                        var maContext = ctx.Extension<ModularAvatarContext>().BuildContext;
+                        FixupExpressionsMenuPass.FixupExpressionsMenu(maContext);
+                    });
                });
                seq.Run(SyncParameterSequencePass.Instance);
 #endif
@ -205,6 +220,7 @@ namespace nadena.dev.modular_avatar.core.editor.plugin
        }
    }

+    [RunsOnPlatforms(WellKnownPlatforms.VRChatAvatar30)]
    class MergeAnimatorPluginPass : MAPass<MergeAnimatorPluginPass>
    {
        protected override void Execute(ndmf.BuildContext context)
@ -213,6 +229,7 @@ namespace nadena.dev.modular_avatar.core.editor.plugin
        }
    }

+    [RunsOnPlatforms(WellKnownPlatforms.VRChatAvatar30)]
    class MenuInstallPluginPass : MAPass<MenuInstallPluginPass>
    {
        protected override void Execute(ndmf.BuildContext context)
@ -239,6 +256,7 @@ namespace nadena.dev.modular_avatar.core.editor.plugin
    }

 #if MA_VRCSDK3_AVATARS
+    [RunsOnPlatforms(WellKnownPlatforms.VRChatAvatar30)]
    class VisibleHeadAccessoryPluginPass : MAPass<VisibleHeadAccessoryPluginPass>
    {
        protected override void Execute(ndmf.BuildContext context)
@ -257,6 +275,7 @@ namespace nadena.dev.modular_avatar.core.editor.plugin
    }

 #if MA_VRCSDK3_AVATARS
+    [RunsOnPlatforms(WellKnownPlatforms.VRChatAvatar30)] // TODO - support other platforms
    class BlendshapeSyncAnimationPluginPass : MAPass<BlendshapeSyncAnimationPluginPass>
    {
        protected override void Execute(ndmf.BuildContext context)
@ -264,7 +283,7 @@ namespace nadena.dev.modular_avatar.core.editor.plugin
            new BlendshapeSyncAnimationProcessor(context).OnPreprocessAvatar();
        }
    }
-
+    
    class PhysbonesBlockerPluginPass : MAPass<PhysbonesBlockerPluginPass>
    {
        protected override void Execute(ndmf.BuildContext context)
--- a/Editor/ReactiveObjects/AnimationGeneration/AnimatedProperty.cs
+++ b/Editor/ReactiveObjects/AnimationGeneration/AnimatedProperty.cs
@ -1,4 +1,6 @@
-using System;
+#nullable enable
+
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using Object = UnityEngine.Object;
@ -34,7 +36,7 @@ namespace nadena.dev.modular_avatar.core.editor
                   TargetProp.Equals(other.TargetProp);
        }

-        public override bool Equals(object obj)
+        public override bool Equals(object? obj)
        {
            if (obj is null) return false;
            if (ReferenceEquals(this, obj)) return true;
--- a/Editor/ReactiveObjects/AnimationGeneration/ReactiveObjectPass.cs
+++ b/Editor/ReactiveObjects/AnimationGeneration/ReactiveObjectPass.cs
@ -40,13 +40,11 @@ namespace nadena.dev.modular_avatar.core.editor
            // Having a WD OFF layer after WD ON layers can break WD. We match the behavior of the existing states,
            // and if mixed, use WD ON to maximize compatibility.
            var asc = context.Extension<AnimatorServicesContext>();
-            _writeDefaults = asc.ControllerContext.Controllers[VRCAvatarDescriptor.AnimLayerType.FX]?.Layers.Any(
-                l => l.StateMachine.StateMachines.Any(
-                    sm => sm.StateMachine.AllStates().Any(
-                        s => s.WriteDefaultValues && s.Motion is not VirtualBlendTree
-                    )
-                )
-            ) ?? true;
+            var fxLayer = asc.ControllerContext.Controllers[VRCAvatarDescriptor.AnimLayerType.FX];
+            if (fxLayer != null)
+            {
+                _writeDefaults = MergeAnimatorProcessor.AnalyzeLayerWriteDefaults(fxLayer) ?? true;
+            }
            
            var analysis = new ReactiveObjectAnalyzer(context).Analyze(context.AvatarRootObject);

--- a/Editor/ReactiveObjects/AnimationGeneration/ReactiveObjectPrepass.cs
+++ b/Editor/ReactiveObjects/AnimationGeneration/ReactiveObjectPrepass.cs
@ -9,6 +9,7 @@ namespace nadena.dev.modular_avatar.core.editor
    ///     Reserve an animator layer for reactive object use. We do this here so that we can take advantage of MergeAnimator's
    ///     layer reference correction logic; this can go away once we have a more unified animation services API.
    /// </summary>
+    [RunsOnPlatforms(WellKnownPlatforms.VRChatAvatar30)]
    internal class ReactiveObjectPrepass : Pass<ReactiveObjectPrepass>
    {
        internal const string TAG_PATH = "__MA/ShapeChanger/PrepassPlaceholder";
@ -49,7 +50,7 @@ namespace nadena.dev.modular_avatar.core.editor
                var obj = new GameObject("MA SC Defaults");
                obj.transform.SetParent(context.AvatarRootTransform);
                var mambt = obj.AddComponent<ModularAvatarMergeBlendTree>();
-                mambt.BlendTree = bt;
+                mambt.Motion = bt;
                mambt.PathMode = MergeAnimatorPathMode.Absolute;
            }
        }
--- a/Editor/ReactiveObjects/ParameterAssignerPass.cs
+++ b/Editor/ReactiveObjects/ParameterAssignerPass.cs
@ -54,6 +54,7 @@ namespace nadena.dev.modular_avatar.core.editor
            if (!context.AvatarDescriptor) return;
            
            var paramIndex = 0;
+            var mappings = ParameterRenameMappings.Get(context);

            var declaredParams = context.AvatarDescriptor.expressionParameters.parameters
                .GroupBy(p => p.name).Select(l => l.First())
@ -72,7 +73,8 @@ namespace nadena.dev.modular_avatar.core.editor
                    if (mami.Control == null) mami.Control = new VRCExpressionsMenu.Control();
                    mami.Control.parameter = new VRCExpressionsMenu.Control.Parameter
                    {
-                        name = $"__MA/AutoParam/{mami.gameObject.name}${paramIndex++}"
+                        name = mappings.Remap(mami, ParameterNamespace.Animator,
+                            $"__MA/AutoParam/{mami.gameObject.name}")
                    };
                }
                
--- a/Editor/RenameParametersHook.cs
+++ b/Editor/RenameParametersHook.cs
@ -6,6 +6,8 @@ using System;
 using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Linq;
+using System.Security.Cryptography;
+using System.Text;
 using nadena.dev.modular_avatar.editor.ErrorReporting;
 using nadena.dev.ndmf;
 using nadena.dev.ndmf.animator;
@ -17,8 +19,6 @@ using VRC.SDK3.Dynamics.Contact.Components;
 using VRC.SDK3.Dynamics.PhysBone.Components;
 using Object = UnityEngine.Object;

-using UnityObject = UnityEngine.Object;
-
 #endregion

 namespace nadena.dev.modular_avatar.core.editor
@ -30,18 +30,39 @@ namespace nadena.dev.modular_avatar.core.editor
            return ctx.GetState<ParameterRenameMappings>();
        }

-        public Dictionary<(ModularAvatarParameters, ParameterNamespace, string), string> Remappings =
-            new Dictionary<(ModularAvatarParameters, ParameterNamespace, string), string>();
+        private readonly HashSet<string> usedNames = new();
+        public Dictionary<(Component, ParameterNamespace, string), string> Remappings = new();

        private int internalParamIndex;

-        public string Remap(ModularAvatarParameters p, ParameterNamespace ns, string s)
+        public string Remap(Component p, ParameterNamespace ns, string s)
        {
            var tuple = (p, ns, s);

            if (Remappings.TryGetValue(tuple, out var mapping)) return mapping;

-            mapping = s + "$$Internal_" + internalParamIndex++;
+            var path = RuntimeUtil.AvatarRootPath(p.gameObject)!;
+            string pathHash;
+            using (var sha = SHA256.Create())
+            {
+                var hashBytes = sha.ComputeHash(Encoding.UTF8.GetBytes(path));
+
+                StringBuilder sb = new();
+                for (var i = 0; i < 6; i++)
+                {
+                    sb.AppendFormat("{0:x2}", hashBytes[i]);
+                }
+
+                pathHash = sb.ToString();
+            }
+
+            mapping = s + "$" + pathHash;
+
+            for (var i = 0; !usedNames.Add(mapping); i++)
+            {
+                mapping = s + "$" + mapping + "." + i;
+            }
+            
            Remappings[tuple] = mapping;
            
            return mapping;
@ -73,8 +94,8 @@ namespace nadena.dev.modular_avatar.core.editor
            private static long encounterOrderCounter;
            
            public ParameterConfig ResolvedParameter;
-            public List<UnityObject> TypeSources = new List<UnityObject>();
-            public List<UnityObject> DefaultSources = new List<UnityObject>();
+            public List<Object> TypeSources = new List<Object>();
+            public List<Object> DefaultSources = new List<Object>();
            public ImmutableHashSet<float> ConflictingValues = ImmutableHashSet<float>.Empty;
            public ImmutableHashSet<ParameterSyncType> ConflictingSyncTypes = ImmutableHashSet<ParameterSyncType>.Empty;
            
@ -174,7 +195,7 @@ namespace nadena.dev.modular_avatar.core.editor

            // clean up all parameters objects before the ParameterAssignerPass runs
            foreach (var p in avatar.GetComponentsInChildren<ModularAvatarParameters>())
-                UnityObject.DestroyImmediate(p);
+                Object.DestroyImmediate(p);
        }

        private void SetExpressionParameters(GameObject avatarRoot, ImmutableDictionary<string, ParameterInfo> allParams)
@ -366,7 +387,7 @@ namespace nadena.dev.modular_avatar.core.editor
                            break;
                        }

-                        case IVirtualizeAnimatorController virtualized:
+                        case IVirtualizeAnimatorController or IVirtualizeMotion:
                        {
                            var mappings = paramInfo.GetParameterRemappingsAt(obj);
                            var remap = mappings.SelectMany(item =>
@ -381,7 +402,7 @@ namespace nadena.dev.modular_avatar.core.editor
                                );
                            }).ToImmutableDictionary();

-                            var controller = animServices.ControllerContext.Controllers[virtualized];
+                            var controller = animServices.ControllerContext.Controllers[component];
                            if (controller != null)
                            {
                                ProcessVirtualAnimatorController(controller, remap);
@ -390,17 +411,6 @@ namespace nadena.dev.modular_avatar.core.editor
                            break;
                        }

-                        case ModularAvatarMergeBlendTree merger:
-                        {
-                            var motion = animServices.ControllerContext.GetVirtualizedMotion(merger);
-                            if (motion is VirtualBlendTree bt)
-                            {
-                                ProcessBlendtree(bt, paramInfo.GetParameterRemappingsAt(obj));
-                            }
-
-                            break;
-                        }
-
                        case ModularAvatarMenuInstaller installer:
                        {
                            if (installer.menuToAppend != null && installer.enabled)
--- a/Editor/SyncParameterSequencePass.cs
+++ b/Editor/SyncParameterSequencePass.cs
@ -12,6 +12,7 @@ using Object = UnityEngine.Object;

 namespace nadena.dev.modular_avatar.core.editor
 {
+    [RunsOnPlatforms(WellKnownPlatforms.VRChatAvatar30)]
    public class SyncParameterSequencePass : Pass<SyncParameterSequencePass>
    {
        private static Platform? CurrentPlatform
--- a/Editor/VRChat.meta
+++ b/Editor/VRChat.meta
@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 476a3ae35e5046989e0c7276ae860e3c
+timeCreated: 1742695540
--- a/Editor/VRChat/VRChatSettingsPass.cs
+++ b/Editor/VRChat/VRChatSettingsPass.cs
@ -0,0 +1,24 @@
+using System.Collections.Generic;
+using nadena.dev.modular_avatar.editor.ErrorReporting;
+using nadena.dev.ndmf;
+
+namespace nadena.dev.modular_avatar.core.editor
+{
+    [RunsOnPlatforms(WellKnownPlatforms.VRChatAvatar30)]
+    internal class VRChatSettingsPass : Pass<VRChatSettingsPass>
+    {
+        protected override void Execute(ndmf.BuildContext context)
+        {
+            var settings = context.AvatarRootObject.GetComponentsInChildren<ModularAvatarVRChatSettings>(true);
+
+            if (settings.Length > 1)
+            {
+                var objects = new List<object>();
+                objects.Add("MA VRChat Settings");
+                objects.AddRange(settings);
+
+                BuildReport.LogFatal("error.singleton", objects);
+            }
+        }
+    }
+}
--- a/Editor/VRChat/VRChatSettingsPass.cs.meta
+++ b/Editor/VRChat/VRChatSettingsPass.cs.meta
@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: cc7a69c0f9aa469dbcf8d4b492f5a6d9
+timeCreated: 1742695552
--- a/Editor/WorldScaleObjectPass.cs
+++ b/Editor/WorldScaleObjectPass.cs
@ -2,7 +2,7 @@
 using nadena.dev.ndmf;
 using UnityEditor;
 using UnityEngine;
-#if VRC_SDK_VRCSDK3
+#if MA_VRCSDK3_AVATARS
 using VRC.Dynamics;
 using VRC.SDK3.Dynamics.Constraint.Components;

@ -12,6 +12,7 @@ using UnityEngine.Animations;

 namespace nadena.dev.modular_avatar.core.editor
 {
+    [RunsOnPlatforms(WellKnownPlatforms.VRChatAvatar30)]
    internal class WorldScaleObjectPass : Pass<WorldScaleObjectPass>
    {
        protected override void Execute(ndmf.BuildContext context)
--- a/Runtime/MAMoveIndependently.cs
+++ b/Runtime/MAMoveIndependently.cs
@ -16,8 +16,6 @@ namespace nadena.dev.modular_avatar.core
    [HelpURL("https://modular-avatar.nadena.dev/docs/reference/move-independently?lang=auto")]
    class MAMoveIndependently : MonoBehaviour, IEditorOnly
    {
-        private float EPSILON = 0.0000001f;
-
        [SerializeField]
        private GameObject[] m_groupedBones;

--- a/Runtime/ModularAvatarMergeAnimator.cs
+++ b/Runtime/ModularAvatarMergeAnimator.cs
@ -85,7 +85,7 @@ namespace nadena.dev.modular_avatar.core
            set => animator = value;
        }

-        string IVirtualizeAnimatorController.GetMotionBasePath(object ndmfBuildContext, bool clearPath = true)
+        string IVirtualizeAnimatorController.GetMotionBasePath(object ndmfBuildContext, bool clearPath)
        {
            var path = GetMotionBasePathCallback(this, ndmfBuildContext);
            if (clearPath) pathMode = MergeAnimatorPathMode.Absolute;
--- a/Runtime/ModularAvatarMergeBlendTree.cs
+++ b/Runtime/ModularAvatarMergeBlendTree.cs
@ -1,31 +1,51 @@
 #if MA_VRCSDK3_AVATARS

 using System;
-using API;
+using nadena.dev.ndmf.animator;
+using JetBrains.Annotations;
 using UnityEngine;
 using Object = UnityEngine.Object;

 namespace nadena.dev.modular_avatar.core
 {
-    [AddComponentMenu("Modular Avatar/MA Merge Blend Tree")]
+    [AddComponentMenu("Modular Avatar/MA Merge Motion (Blend Tree)")]
    [HelpURL("https://modular-avatar.nadena.dev/docs/reference/merge-blend-tree?lang=auto")]
    public sealed class ModularAvatarMergeBlendTree : AvatarTagComponent, IVirtualizeMotion
    {
        internal static Func<ModularAvatarMergeBlendTree, object, string> GetMotionBasePathCallback
            = (_, _) => "";
-        
-        // We can't actually reference a BlendTree here because it's not available when building a player build
+
+        // Previous versions of this component expected a BlendTree, which is not available in player builds, so this
+        // field was made an Object. This can now become a Motion, but unfortunately that would be a breaking change.
+
+        /// <summary>
+        ///     The blend tree or other motion to merge.
+        /// </summary>
+        [Obsolete("Use Motion property instead; this field will be removed in 2.0")] [PublicAPI]
        public Object BlendTree;
+
+        [PublicAPI]
        public MergeAnimatorPathMode PathMode = MergeAnimatorPathMode.Relative;
+
+        [PublicAPI]
        public AvatarObjectReference RelativePathRoot = new AvatarObjectReference();

+        [PublicAPI]
+        public Motion Motion
+        {
+            get => ((IVirtualizeMotion)this).Motion;
+            set => ((IVirtualizeMotion)this).Motion = value;
+        }
+        
        Motion IVirtualizeMotion.Motion
        {
+#pragma warning disable CS0618 // Type or member is obsolete
            get => (Motion)BlendTree;
            set => BlendTree = value;
+#pragma warning restore CS0618 // Type or member is obsolete
        }

-        string IVirtualizeMotion.GetMotionBasePath(object ndmfBuildContext, bool clearPath = true)
+        string IVirtualizeMotion.GetMotionBasePath(object ndmfBuildContext, bool clearPath)
        {
            var path = GetMotionBasePathCallback(this, ndmfBuildContext);

--- a/Runtime/ModularAvatarVRChatSettings.cs
+++ b/Runtime/ModularAvatarVRChatSettings.cs
@ -0,0 +1,20 @@
+using JetBrains.Annotations;
+using UnityEngine;
+
+namespace nadena.dev.modular_avatar.core
+{
+    [AddComponentMenu("Modular Avatar/MA VRChat Settings")]
+    [DisallowMultipleComponent]
+    [HelpURL("https://modular-avatar.nadena.dev/docs/reference/vrchat-settings?lang=auto")]
+    public class ModularAvatarVRChatSettings : AvatarTagComponent
+    {
+        [SerializeField] internal bool m_mmdWorldSupport = true;
+
+        [PublicAPI]
+        public bool MMDWorldSupport
+        {
+            get => m_mmdWorldSupport;
+            set => m_mmdWorldSupport = value;
+        }
+    }
+}
--- a/Runtime/ModularAvatarVRChatSettings.cs.meta
+++ b/Runtime/ModularAvatarVRChatSettings.cs.meta
@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 89c938d7d8a741df99f2eda501b3a6fe
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {fileID: 2800000, guid: a8edd5bd1a0a64a40aa99cc09fb5f198, type: 3}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/UnitTests~/Animation/MergeBlendTreeTest.cs
+++ b/UnitTests~/Animation/MergeBlendTreeTest.cs
@ -11,6 +11,7 @@ using UnityEditor.Animations;
 using UnityEngine;
 using VRC.SDK3.Avatars.Components;
 using AvatarProcessor = nadena.dev.ndmf.AvatarProcessor;
+#pragma warning disable CS0618 // Type or member is obsolete

 namespace modular_avatar_tests
 {
@ -97,6 +98,28 @@ namespace modular_avatar_tests
            AnimationTestUtil.AssertAnimationHasPath(((BlendTree)motion.children[0].motion).children[0].motion as AnimationClip, "child2/a");
        }

+        [Test]
+        public void SupportsMergingMotions()
+        {
+            AnimationClip clip = new AnimationClip();
+            clip.name = "test clip";
+            
+            var root = CreateRoot("root");
+            var c1 = CreateChild(root, "child1");
+            var mergeComponent = c1.AddComponent<ModularAvatarMergeBlendTree>();
+            mergeComponent.Motion = clip;
+            mergeComponent.PathMode = MergeAnimatorPathMode.Relative;
+            mergeComponent.RelativePathRoot.referencePath = "child2";
+            CreateChild(c1, "a");
+            
+            AvatarProcessor.ProcessAvatar(root);
+            
+            var fx = findFxLayer(root, MergeBlendTreePass.BlendTreeLayerName);
+            var motion = fx.stateMachine.states[0].state.motion as BlendTree;
+            
+            Assert.IsTrue(motion!.children.Any(m => m.motion.name == clip.name));
+        }
+
        [Test]
        public void MergeOrderTest()
        {
@ -118,6 +141,49 @@ namespace modular_avatar_tests
            
            Assert.AreEqual(new[] {MergeBlendTreePass.BlendTreeLayerName, MMDRelayPass.ControlLayerName, MMDRelayPass.DummyLayerName, "m2", "Eyes", "FaceMood", "m1", "m3"}, layerNames);
        }
+    
+        [Test]
+        public void BoolParameterConvertedToFloat()
+        {
+            // Create an animator controller with a bool parameter
+            var controller = new AnimatorController();
+            controller.AddParameter("testBool", AnimatorControllerParameterType.Bool);
+        
+            // Create the root object and set the FX layer to the created controller
+            var root = CreateRoot("root");
+            var vrcDesc = root.GetComponent<VRCAvatarDescriptor>();
+            var baseLayers = vrcDesc.baseAnimationLayers;
+
+            for (int i = 0; i < baseLayers.Length; i++)
+            {
+                if (baseLayers[i].type == VRCAvatarDescriptor.AnimLayerType.FX)
+                {
+                    baseLayers[i].animatorController = controller;
+                    baseLayers[i].isDefault = false;
+                }
+            }
+
+            vrcDesc.customizeAnimationLayers = true;
+        
+            // Add a Merge Blend Tree component using the same parameter
+            var child = CreateChild(root, "child");
+            var mergeComponent = child.AddComponent<ModularAvatarMergeBlendTree>();
+            var blendTree = new BlendTree
+            {
+                blendParameter = "testBool",
+                blendType = BlendTreeType.Simple1D
+            };
+            blendTree.AddChild(AnimationTestUtil.AnimationWithPath("a"));
+            mergeComponent.BlendTree = blendTree;
+        
+            // Process the avatar
+            AvatarProcessor.ProcessAvatar(root);
+        
+            // Verify that the parameter is converted to a float
+            var fxController = FindController(root, VRCAvatarDescriptor.AnimLayerType.FX).animatorController as AnimatorController;
+            Assert.IsTrue(fxController!.parameters.Any(p =>
+                p.name == "testBool" && p.type == AnimatorControllerParameterType.Float));
+        }

        ModularAvatarMergeAnimator TestMerge(GameObject root, string mergeName, Motion motion = null)
        {
--- a/UnitTests~/FixupExpressionsMenuPassTests.meta
+++ b/UnitTests~/FixupExpressionsMenuPassTests.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 0728ebdfdba1b344a9101097e4089eff
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/UnitTests~/FixupExpressionsMenuPassTests/123x45px.png
+++ b/UnitTests~/FixupExpressionsMenuPassTests/123x45px.png
--- a/UnitTests~/FixupExpressionsMenuPassTests/123x45px.png.meta
+++ b/UnitTests~/FixupExpressionsMenuPassTests/123x45px.png.meta
@ -0,0 +1,127 @@
+fileFormatVersion: 2
+guid: fdecfaf15af12c94ebc238c62386da03
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 0
+    wrapV: 0
+    wrapW: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 0
+  spriteTessellationDetail: -1
+  textureType: 0
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/UnitTests~/FixupExpressionsMenuPassTests/FixupExpressionsMenuPassTests.cs
+++ b/UnitTests~/FixupExpressionsMenuPassTests/FixupExpressionsMenuPassTests.cs
@ -0,0 +1,35 @@
+#if MA_VRCSDK3_AVATARS
+
+using System.Linq;
+using modular_avatar_tests;
+using nadena.dev.modular_avatar.core.editor;
+using NUnit.Framework;
+using VRC.SDK3.Avatars.Components;
+
+namespace UnitTests.FixupExpressionsMenuPassTests
+{
+    public class FixupExpressionsMenuPassTests : TestBase
+    {
+        [Test]
+        public void FixupExpressionsMenuWorksOnOddSizedImages()
+        {
+            var prefab = CreatePrefab("OddSizedTextureTest.prefab");
+            
+            AvatarProcessor.ProcessAvatar(prefab);
+
+            var targetMenu = prefab.GetComponent<VRCAvatarDescriptor>().expressionsMenu;
+            var targetElem = targetMenu.controls.First(c => c.name == "testmenu");
+
+            var tex = targetElem.icon;
+            
+            // Rounds up to a multiple of four
+            Assert.AreEqual(124, tex.width);
+            Assert.AreEqual(48, tex.height);
+            
+            // ... which is needed in order for texture compression to succeed
+            Assert.AreEqual(FixupExpressionsMenuPass.TargetFormat, tex.format);
+        }
+    }
+}
+
+#endif
--- a/UnitTests~/FixupExpressionsMenuPassTests/FixupExpressionsMenuPassTests.cs.meta
+++ b/UnitTests~/FixupExpressionsMenuPassTests/FixupExpressionsMenuPassTests.cs.meta
@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 994ab7b4f445406799527ab1fa22f993
+timeCreated: 1742353952
--- a/UnitTests~/FixupExpressionsMenuPassTests/OddSizedTextureTest.prefab
+++ b/UnitTests~/FixupExpressionsMenuPassTests/OddSizedTextureTest.prefab
@ -0,0 +1,402 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &3990668988804345462
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5638450846039665839}
+  - component: {fileID: 813151555320168457}
+  - component: {fileID: 3678459968214189440}
+  - component: {fileID: 4704574485447146425}
+  m_Layer: 0
+  m_Name: OddSizedTextureTest
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &5638450846039665839
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3990668988804345462}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: -1.1366987, y: 0.08456379, z: -1.4804463}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 7859607209538616757}
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!95 &813151555320168457
+Animator:
+  serializedVersion: 5
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3990668988804345462}
+  m_Enabled: 1
+  m_Avatar: {fileID: 0}
+  m_Controller: {fileID: 0}
+  m_CullingMode: 0
+  m_UpdateMode: 0
+  m_ApplyRootMotion: 0
+  m_LinearVelocityBlending: 0
+  m_StabilizeFeet: 0
+  m_WarningMessage: 
+  m_HasTransformHierarchy: 1
+  m_AllowConstantClipSamplingOptimization: 1
+  m_KeepAnimatorStateOnDisable: 0
+  m_WriteDefaultValuesOnDisable: 0
+--- !u!114 &3678459968214189440
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3990668988804345462}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 542108242, guid: 67cc4cb7839cd3741b63733d5adf0442, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  Name: 
+  ViewPosition: {x: 0, y: 1.6, z: 0.2}
+  Animations: 0
+  ScaleIPD: 1
+  lipSync: 0
+  lipSyncJawBone: {fileID: 0}
+  lipSyncJawClosed: {x: 0, y: 0, z: 0, w: 1}
+  lipSyncJawOpen: {x: 0, y: 0, z: 0, w: 1}
+  VisemeSkinnedMesh: {fileID: 0}
+  MouthOpenBlendShapeName: Facial_Blends.Jaw_Down
+  VisemeBlendShapes: []
+  unityVersion: 2022.3.22f1
+  portraitCameraPositionOffset: {x: 0, y: 0, z: 0}
+  portraitCameraRotationOffset: {x: 0, y: 1, z: 0, w: -0.00000004371139}
+  networkIDs: []
+  customExpressions: 0
+  expressionsMenu: {fileID: 0}
+  expressionParameters: {fileID: 0}
+  enableEyeLook: 0
+  customEyeLookSettings:
+    eyeMovement:
+      confidence: 0.5
+      excitement: 0.5
+    leftEye: {fileID: 0}
+    rightEye: {fileID: 0}
+    eyesLookingStraight:
+      linked: 1
+      left: {x: 0, y: 0, z: 0, w: 0}
+      right: {x: 0, y: 0, z: 0, w: 0}
+    eyesLookingUp:
+      linked: 1
+      left: {x: 0, y: 0, z: 0, w: 0}
+      right: {x: 0, y: 0, z: 0, w: 0}
+    eyesLookingDown:
+      linked: 1
+      left: {x: 0, y: 0, z: 0, w: 0}
+      right: {x: 0, y: 0, z: 0, w: 0}
+    eyesLookingLeft:
+      linked: 1
+      left: {x: 0, y: 0, z: 0, w: 0}
+      right: {x: 0, y: 0, z: 0, w: 0}
+    eyesLookingRight:
+      linked: 1
+      left: {x: 0, y: 0, z: 0, w: 0}
+      right: {x: 0, y: 0, z: 0, w: 0}
+    eyelidType: 0
+    upperLeftEyelid: {fileID: 0}
+    upperRightEyelid: {fileID: 0}
+    lowerLeftEyelid: {fileID: 0}
+    lowerRightEyelid: {fileID: 0}
+    eyelidsDefault:
+      upper:
+        linked: 1
+        left: {x: 0, y: 0, z: 0, w: 0}
+        right: {x: 0, y: 0, z: 0, w: 0}
+      lower:
+        linked: 1
+        left: {x: 0, y: 0, z: 0, w: 0}
+        right: {x: 0, y: 0, z: 0, w: 0}
+    eyelidsClosed:
+      upper:
+        linked: 1
+        left: {x: 0, y: 0, z: 0, w: 0}
+        right: {x: 0, y: 0, z: 0, w: 0}
+      lower:
+        linked: 1
+        left: {x: 0, y: 0, z: 0, w: 0}
+        right: {x: 0, y: 0, z: 0, w: 0}
+    eyelidsLookingUp:
+      upper:
+        linked: 1
+        left: {x: 0, y: 0, z: 0, w: 0}
+        right: {x: 0, y: 0, z: 0, w: 0}
+      lower:
+        linked: 1
+        left: {x: 0, y: 0, z: 0, w: 0}
+        right: {x: 0, y: 0, z: 0, w: 0}
+    eyelidsLookingDown:
+      upper:
+        linked: 1
+        left: {x: 0, y: 0, z: 0, w: 0}
+        right: {x: 0, y: 0, z: 0, w: 0}
+      lower:
+        linked: 1
+        left: {x: 0, y: 0, z: 0, w: 0}
+        right: {x: 0, y: 0, z: 0, w: 0}
+    eyelidsSkinnedMesh: {fileID: 0}
+    eyelidsBlendshapes: 
+  customizeAnimationLayers: 0
+  baseAnimationLayers:
+  - isEnabled: 0
+    type: 0
+    animatorController: {fileID: 0}
+    mask: {fileID: 0}
+    isDefault: 1
+  - isEnabled: 0
+    type: 4
+    animatorController: {fileID: 0}
+    mask: {fileID: 0}
+    isDefault: 1
+  - isEnabled: 0
+    type: 5
+    animatorController: {fileID: 0}
+    mask: {fileID: 0}
+    isDefault: 1
+  specialAnimationLayers:
+  - isEnabled: 0
+    type: 6
+    animatorController: {fileID: 0}
+    mask: {fileID: 0}
+    isDefault: 1
+  - isEnabled: 0
+    type: 7
+    animatorController: {fileID: 0}
+    mask: {fileID: 0}
+    isDefault: 1
+  - isEnabled: 0
+    type: 8
+    animatorController: {fileID: 0}
+    mask: {fileID: 0}
+    isDefault: 1
+  AnimationPreset: {fileID: 0}
+  animationHashSet: []
+  autoFootsteps: 1
+  autoLocomotion: 1
+  collider_head:
+    isMirrored: 1
+    state: 0
+    transform: {fileID: 0}
+    radius: 0
+    height: 0
+    position: {x: 0, y: 0, z: 0}
+    rotation: {x: 0, y: 0, z: 0, w: 1}
+  collider_torso:
+    isMirrored: 1
+    state: 0
+    transform: {fileID: 0}
+    radius: 0
+    height: 0
+    position: {x: 0, y: 0, z: 0}
+    rotation: {x: 0, y: 0, z: 0, w: 1}
+  collider_footR:
+    isMirrored: 1
+    state: 0
+    transform: {fileID: 0}
+    radius: 0
+    height: 0
+    position: {x: 0, y: 0, z: 0}
+    rotation: {x: 0, y: 0, z: 0, w: 1}
+  collider_footL:
+    isMirrored: 1
+    state: 0
+    transform: {fileID: 0}
+    radius: 0
+    height: 0
+    position: {x: 0, y: 0, z: 0}
+    rotation: {x: 0, y: 0, z: 0, w: 1}
+  collider_handR:
+    isMirrored: 1
+    state: 0
+    transform: {fileID: 0}
+    radius: 0
+    height: 0
+    position: {x: 0, y: 0, z: 0}
+    rotation: {x: 0, y: 0, z: 0, w: 1}
+  collider_handL:
+    isMirrored: 1
+    state: 0
+    transform: {fileID: 0}
+    radius: 0
+    height: 0
+    position: {x: 0, y: 0, z: 0}
+    rotation: {x: 0, y: 0, z: 0, w: 1}
+  collider_fingerIndexL:
+    isMirrored: 1
+    state: 0
+    transform: {fileID: 0}
+    radius: 0
+    height: 0
+    position: {x: 0, y: 0, z: 0}
+    rotation: {x: 0, y: 0, z: 0, w: 1}
+  collider_fingerMiddleL:
+    isMirrored: 1
+    state: 0
+    transform: {fileID: 0}
+    radius: 0
+    height: 0
+    position: {x: 0, y: 0, z: 0}
+    rotation: {x: 0, y: 0, z: 0, w: 1}
+  collider_fingerRingL:
+    isMirrored: 1
+    state: 0
+    transform: {fileID: 0}
+    radius: 0
+    height: 0
+    position: {x: 0, y: 0, z: 0}
+    rotation: {x: 0, y: 0, z: 0, w: 1}
+  collider_fingerLittleL:
+    isMirrored: 1
+    state: 0
+    transform: {fileID: 0}
+    radius: 0
+    height: 0
+    position: {x: 0, y: 0, z: 0}
+    rotation: {x: 0, y: 0, z: 0, w: 1}
+  collider_fingerIndexR:
+    isMirrored: 1
+    state: 0
+    transform: {fileID: 0}
+    radius: 0
+    height: 0
+    position: {x: 0, y: 0, z: 0}
+    rotation: {x: 0, y: 0, z: 0, w: 1}
+  collider_fingerMiddleR:
+    isMirrored: 1
+    state: 0
+    transform: {fileID: 0}
+    radius: 0
+    height: 0
+    position: {x: 0, y: 0, z: 0}
+    rotation: {x: 0, y: 0, z: 0, w: 1}
+  collider_fingerRingR:
+    isMirrored: 1
+    state: 0
+    transform: {fileID: 0}
+    radius: 0
+    height: 0
+    position: {x: 0, y: 0, z: 0}
+    rotation: {x: 0, y: 0, z: 0, w: 1}
+  collider_fingerLittleR:
+    isMirrored: 1
+    state: 0
+    transform: {fileID: 0}
+    radius: 0
+    height: 0
+    position: {x: 0, y: 0, z: 0}
+    rotation: {x: 0, y: 0, z: 0, w: 1}
+--- !u!114 &4704574485447146425
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3990668988804345462}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: -1427037861, guid: 4ecd63eff847044b68db9453ce219299, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  launchedFromSDKPipeline: 0
+  completedSDKPipeline: 0
+  blueprintId: 
+  contentType: 0
+  assetBundleUnityVersion: 
+  fallbackStatus: 2
+--- !u!1 &5130770126475706269
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7859607209538616757}
+  - component: {fileID: 1204253887592837851}
+  - component: {fileID: 4596705629491158387}
+  m_Layer: 0
+  m_Name: testmenu
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &7859607209538616757
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5130770126475706269}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 5638450846039665839}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &1204253887592837851
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5130770126475706269}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 7ef83cb0c23d4d7c9d41021e544a1978, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  menuToAppend: {fileID: 0}
+  installTargetMenu: {fileID: 0}
+--- !u!114 &4596705629491158387
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5130770126475706269}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3b29d45007c5493d926d2cd45a489529, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  Control:
+    name: 
+    icon: {fileID: 2800000, guid: fdecfaf15af12c94ebc238c62386da03, type: 3}
+    type: 102
+    parameter:
+      name: 
+    value: 1
+    style: 0
+    subMenu: {fileID: 0}
+    subParameters: []
+    labels: []
+  MenuSource: 1
+  menuSource_otherObjectChildren: {fileID: 0}
+  isSynced: 1
+  isSaved: 1
+  isDefault: 0
+  automaticValue: 1
+  label: 
--- a/UnitTests~/FixupExpressionsMenuPassTests/OddSizedTextureTest.prefab.meta
+++ b/UnitTests~/FixupExpressionsMenuPassTests/OddSizedTextureTest.prefab.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: b06e93c5a53eac64a84e4218cc5314f9
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/UnitTests~/MergeAnimatorTests/WriteDefaults/TestSet_false.controller
+++ b/UnitTests~/MergeAnimatorTests/WriteDefaults/TestSet_false.controller
@ -1,5 +1,30 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!1107 &-8503209154062428420
+AnimatorStateMachine:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: M_BlendTree_with_transitions
+  m_ChildStates:
+  - serializedVersion: 1
+    m_State: {fileID: 3206768364943963491}
+    m_Position: {x: 370, y: 170, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: 8331571476920691053}
+    m_Position: {x: 390, y: 30, z: 0}
+  m_ChildStateMachines: []
+  m_AnyStateTransitions: []
+  m_EntryTransitions: []
+  m_StateMachineTransitions: {}
+  m_StateMachineBehaviours: []
+  m_AnyStatePosition: {x: 50, y: 20, z: 0}
+  m_EntryPosition: {x: 50, y: 120, z: 0}
+  m_ExitPosition: {x: 800, y: 120, z: 0}
+  m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
+  m_DefaultState: {fileID: 3206768364943963491}
 --- !u!1102 &-8090073552076825221
 AnimatorState:
  serializedVersion: 6
@ -48,6 +73,21 @@ AnimatorStateTransition:
  m_InterruptionSource: 0
  m_OrderedInterruption: 1
  m_CanTransitionToSelf: 1
+--- !u!206 &-7204475951612894757
+BlendTree:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Blend Tree
+  m_Childs: []
+  m_BlendParameter: Blend
+  m_BlendParameterY: Blend
+  m_MinThreshold: 0
+  m_MaxThreshold: 1
+  m_UseAutomaticThresholds: 1
+  m_NormalizedBlendValues: 0
+  m_BlendType: 0
 --- !u!1102 &-7082272376246755188
 AnimatorState:
  serializedVersion: 6
@ -74,6 +114,21 @@ AnimatorState:
  m_MirrorParameter: 
  m_CycleOffsetParameter: 
  m_TimeParameter: 
+--- !u!206 &-4566774630235714795
+BlendTree:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Blend Tree
+  m_Childs: []
+  m_BlendParameter: Blend
+  m_BlendParameterY: Blend
+  m_MinThreshold: 0
+  m_MaxThreshold: 1
+  m_UseAutomaticThresholds: 1
+  m_NormalizedBlendValues: 0
+  m_BlendType: 0
 --- !u!1107 &-4492345216862744995
 AnimatorStateMachine:
  serializedVersion: 6
@ -245,6 +300,43 @@ AnimatorStateTransition:
  m_InterruptionSource: 0
  m_OrderedInterruption: 1
  m_CanTransitionToSelf: 1
+--- !u!206 &-1335452959490511230
+BlendTree:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Blend Tree
+  m_Childs: []
+  m_BlendParameter: Blend
+  m_BlendParameterY: Blend
+  m_MinThreshold: 0
+  m_MaxThreshold: 1
+  m_UseAutomaticThresholds: 1
+  m_NormalizedBlendValues: 0
+  m_BlendType: 0
+--- !u!1107 &-540454885725092262
+AnimatorStateMachine:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 1_BlendTree_InitialOff
+  m_ChildStates:
+  - serializedVersion: 1
+    m_State: {fileID: 5140747817625705091}
+    m_Position: {x: 319.11157, y: 32.108032, z: 0}
+  m_ChildStateMachines: []
+  m_AnyStateTransitions: []
+  m_EntryTransitions: []
+  m_StateMachineTransitions: {}
+  m_StateMachineBehaviours: []
+  m_AnyStatePosition: {x: 50, y: 20, z: 0}
+  m_EntryPosition: {x: 50, y: 120, z: 0}
+  m_ExitPosition: {x: 800, y: 120, z: 0}
+  m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
+  m_DefaultState: {fileID: 5140747817625705091}
 --- !u!1101 &-493648842442313360
 AnimatorStateTransition:
  m_ObjectHideFlags: 1
@ -267,6 +359,32 @@ AnimatorStateTransition:
  m_InterruptionSource: 0
  m_OrderedInterruption: 1
  m_CanTransitionToSelf: 1
+--- !u!1102 &-398412080201691195
+AnimatorState:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: blendtree
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions: []
+  m_StateMachineBehaviours: []
+  m_Position: {x: 50, y: 50, z: 0}
+  m_IKOnFeet: 0
+  m_WriteDefaultValues: 1
+  m_Mirror: 0
+  m_SpeedParameterActive: 0
+  m_MirrorParameterActive: 0
+  m_CycleOffsetParameterActive: 0
+  m_TimeParameterActive: 0
+  m_Motion: {fileID: 20600000, guid: f2beba729514fc94eb1a78f8340a8738, type: 2}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
 --- !u!91 &9100000
 AnimatorController:
  m_ObjectHideFlags: 0
@ -275,7 +393,13 @@ AnimatorController:
  m_PrefabAsset: {fileID: 0}
  m_Name: TestSet_false
  serializedVersion: 5
-  m_AnimatorParameters: []
+  m_AnimatorParameters:
+  - m_Name: Blend
+    m_Type: 1
+    m_DefaultFloat: 0
+    m_DefaultInt: 0
+    m_DefaultBool: 0
+    m_Controller: {fileID: 9100000}
  m_AnimatorLayers:
  - serializedVersion: 5
    m_Name: M_Simple
@ -302,7 +426,7 @@ AnimatorController:
    m_SyncedLayerAffectsTiming: 0
    m_Controller: {fileID: 9100000}
  - serializedVersion: 5
-    m_Name: X_SingleMotion
+    m_Name: M_SingleMotion
    m_StateMachine: {fileID: 7425114331284477142}
    m_Mask: {fileID: 0}
    m_Motions: []
@ -313,6 +437,42 @@ AnimatorController:
    m_IKPass: 0
    m_SyncedLayerAffectsTiming: 0
    m_Controller: {fileID: 9100000}
+  - serializedVersion: 5
+    m_Name: 1_BlendTree_InitialOff
+    m_StateMachine: {fileID: -540454885725092262}
+    m_Mask: {fileID: 0}
+    m_Motions: []
+    m_Behaviours: []
+    m_BlendingMode: 0
+    m_SyncedLayerIndex: -1
+    m_DefaultWeight: 0
+    m_IKPass: 0
+    m_SyncedLayerAffectsTiming: 0
+    m_Controller: {fileID: 9100000}
+  - serializedVersion: 5
+    m_Name: 1_BlendTree_InitialOn
+    m_StateMachine: {fileID: 8678878570627476277}
+    m_Mask: {fileID: 0}
+    m_Motions: []
+    m_Behaviours: []
+    m_BlendingMode: 0
+    m_SyncedLayerIndex: -1
+    m_DefaultWeight: 0
+    m_IKPass: 0
+    m_SyncedLayerAffectsTiming: 0
+    m_Controller: {fileID: 9100000}
+  - serializedVersion: 5
+    m_Name: M_BlendTree_with_transitions
+    m_StateMachine: {fileID: -8503209154062428420}
+    m_Mask: {fileID: 0}
+    m_Motions: []
+    m_Behaviours: []
+    m_BlendingMode: 0
+    m_SyncedLayerIndex: -1
+    m_DefaultWeight: 0
+    m_IKPass: 0
+    m_SyncedLayerAffectsTiming: 0
+    m_Controller: {fileID: 9100000}
  - serializedVersion: 5
    m_Name: M_SubStateMachine
    m_StateMachine: {fileID: -2280786276023912264}
@ -401,6 +561,33 @@ AnimatorState:
  m_MirrorParameter: 
  m_CycleOffsetParameter: 
  m_TimeParameter: 
+--- !u!1102 &3206768364943963491
+AnimatorState:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Blend Tree
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions:
+  - {fileID: 9087045955160975718}
+  m_StateMachineBehaviours: []
+  m_Position: {x: 50, y: 50, z: 0}
+  m_IKOnFeet: 0
+  m_WriteDefaultValues: 0
+  m_Mirror: 0
+  m_SpeedParameterActive: 0
+  m_MirrorParameterActive: 0
+  m_CycleOffsetParameterActive: 0
+  m_TimeParameterActive: 0
+  m_Motion: {fileID: -1335452959490511230}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
 --- !u!1101 &4984055083699384518
 AnimatorStateTransition:
  m_ObjectHideFlags: 1
@ -423,6 +610,32 @@ AnimatorStateTransition:
  m_InterruptionSource: 0
  m_OrderedInterruption: 1
  m_CanTransitionToSelf: 1
+--- !u!1102 &5140747817625705091
+AnimatorState:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Blend Tree
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions: []
+  m_StateMachineBehaviours: []
+  m_Position: {x: 50, y: 50, z: 0}
+  m_IKOnFeet: 0
+  m_WriteDefaultValues: 0
+  m_Mirror: 0
+  m_SpeedParameterActive: 0
+  m_MirrorParameterActive: 0
+  m_CycleOffsetParameterActive: 0
+  m_TimeParameterActive: 0
+  m_Motion: {fileID: -4566774630235714795}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
 --- !u!1102 &5369915444104545634
 AnimatorState:
  serializedVersion: 6
@ -505,7 +718,7 @@ AnimatorStateMachine:
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
-  m_Name: X_SingleMotion
+  m_Name: M_SingleMotion
  m_ChildStates:
  - serializedVersion: 1
    m_State: {fileID: -2269384398499780410}
@ -520,6 +733,32 @@ AnimatorStateMachine:
  m_ExitPosition: {x: 800, y: 120, z: 0}
  m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
  m_DefaultState: {fileID: -2269384398499780410}
+--- !u!1102 &8331571476920691053
+AnimatorState:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Blend Tree 0
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions: []
+  m_StateMachineBehaviours: []
+  m_Position: {x: 50, y: 50, z: 0}
+  m_IKOnFeet: 0
+  m_WriteDefaultValues: 0
+  m_Mirror: 0
+  m_SpeedParameterActive: 0
+  m_MirrorParameterActive: 0
+  m_CycleOffsetParameterActive: 0
+  m_TimeParameterActive: 0
+  m_Motion: {fileID: -7204475951612894757}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
 --- !u!1107 &8675606552853860353
 AnimatorStateMachine:
  serializedVersion: 6
@ -542,3 +781,47 @@ AnimatorStateMachine:
  m_ExitPosition: {x: 800, y: 120, z: 0}
  m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
  m_DefaultState: {fileID: 2924615304351484976}
+--- !u!1107 &8678878570627476277
+AnimatorStateMachine:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 1_BlendTree_InitialOn
+  m_ChildStates:
+  - serializedVersion: 1
+    m_State: {fileID: -398412080201691195}
+    m_Position: {x: 410, y: 80, z: 0}
+  m_ChildStateMachines: []
+  m_AnyStateTransitions: []
+  m_EntryTransitions: []
+  m_StateMachineTransitions: {}
+  m_StateMachineBehaviours: []
+  m_AnyStatePosition: {x: 50, y: 20, z: 0}
+  m_EntryPosition: {x: 50, y: 120, z: 0}
+  m_ExitPosition: {x: 800, y: 120, z: 0}
+  m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
+  m_DefaultState: {fileID: -398412080201691195}
+--- !u!1101 &9087045955160975718
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions: []
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: 8331571476920691053}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0.25
+  m_TransitionOffset: 0
+  m_ExitTime: 0.75
+  m_HasExitTime: 1
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
--- a/UnitTests~/MergeAnimatorTests/WriteDefaults/TestSet_true.controller
+++ b/UnitTests~/MergeAnimatorTests/WriteDefaults/TestSet_true.controller
@ -150,6 +150,32 @@ AnimatorState:
  m_MirrorParameter: 
  m_CycleOffsetParameter: 
  m_TimeParameter: 
+--- !u!1102 &-4604261159886404567
+AnimatorState:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Blend Tree
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions: []
+  m_StateMachineBehaviours: []
+  m_Position: {x: 50, y: 50, z: 0}
+  m_IKOnFeet: 0
+  m_WriteDefaultValues: 0
+  m_Mirror: 0
+  m_SpeedParameterActive: 0
+  m_MirrorParameterActive: 0
+  m_CycleOffsetParameterActive: 0
+  m_TimeParameterActive: 0
+  m_Motion: {fileID: 8886809958447648451}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
 --- !u!1102 &-3889880041459077057
 AnimatorState:
  serializedVersion: 6
@ -176,6 +202,21 @@ AnimatorState:
  m_MirrorParameter: 
  m_CycleOffsetParameter: 
  m_TimeParameter: 
+--- !u!206 &-3697568682967374507
+BlendTree:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Blend Tree
+  m_Childs: []
+  m_BlendParameter: Blend
+  m_BlendParameterY: Blend
+  m_MinThreshold: 0
+  m_MaxThreshold: 1
+  m_UseAutomaticThresholds: 1
+  m_NormalizedBlendValues: 0
+  m_BlendType: 0
 --- !u!1107 &-3544374717376554957
 AnimatorStateMachine:
  serializedVersion: 6
@ -257,7 +298,13 @@ AnimatorController:
  m_PrefabAsset: {fileID: 0}
  m_Name: TestSet_true
  serializedVersion: 5
-  m_AnimatorParameters: []
+  m_AnimatorParameters:
+  - m_Name: Blend
+    m_Type: 1
+    m_DefaultFloat: 0
+    m_DefaultInt: 0
+    m_DefaultBool: 0
+    m_Controller: {fileID: 9100000}
  m_AnimatorLayers:
  - serializedVersion: 5
    m_Name: M_Simple
@ -272,7 +319,7 @@ AnimatorController:
    m_SyncedLayerAffectsTiming: 0
    m_Controller: {fileID: 9100000}
  - serializedVersion: 5
-    m_Name: 1_Additive
+    m_Name: X_Additive
    m_StateMachine: {fileID: 2859792172588103306}
    m_Mask: {fileID: 0}
    m_Motions: []
@ -284,7 +331,7 @@ AnimatorController:
    m_SyncedLayerAffectsTiming: 0
    m_Controller: {fileID: 9100000}
  - serializedVersion: 5
-    m_Name: 1_SingleMotion
+    m_Name: M_SingleMotion
    m_StateMachine: {fileID: 7425114331284477142}
    m_Mask: {fileID: 0}
    m_Motions: []
@ -295,6 +342,42 @@ AnimatorController:
    m_IKPass: 0
    m_SyncedLayerAffectsTiming: 0
    m_Controller: {fileID: 9100000}
+  - serializedVersion: 5
+    m_Name: 1_BlendTree_InitialOff
+    m_StateMachine: {fileID: 8798472560561482739}
+    m_Mask: {fileID: 0}
+    m_Motions: []
+    m_Behaviours: []
+    m_BlendingMode: 0
+    m_SyncedLayerIndex: -1
+    m_DefaultWeight: 0
+    m_IKPass: 0
+    m_SyncedLayerAffectsTiming: 0
+    m_Controller: {fileID: 9100000}
+  - serializedVersion: 5
+    m_Name: 1_BlendTree_InitialOn
+    m_StateMachine: {fileID: 723720481014261193}
+    m_Mask: {fileID: 0}
+    m_Motions: []
+    m_Behaviours: []
+    m_BlendingMode: 0
+    m_SyncedLayerIndex: -1
+    m_DefaultWeight: 0
+    m_IKPass: 0
+    m_SyncedLayerAffectsTiming: 0
+    m_Controller: {fileID: 9100000}
+  - serializedVersion: 5
+    m_Name: M_BlendTree_with_transitions
+    m_StateMachine: {fileID: 6073696076277274403}
+    m_Mask: {fileID: 0}
+    m_Motions: []
+    m_Behaviours: []
+    m_BlendingMode: 0
+    m_SyncedLayerIndex: -1
+    m_DefaultWeight: 0
+    m_IKPass: 0
+    m_SyncedLayerAffectsTiming: 0
+    m_Controller: {fileID: 9100000}
  - serializedVersion: 5
    m_Name: M_SubStateMachine
    m_StateMachine: {fileID: -2280786276023912264}
@ -331,6 +414,70 @@ AnimatorController:
    m_IKPass: 0
    m_SyncedLayerAffectsTiming: 0
    m_Controller: {fileID: 9100000}
+--- !u!1107 &723720481014261193
+AnimatorStateMachine:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 1_BlendTree_InitialOn
+  m_ChildStates:
+  - serializedVersion: 1
+    m_State: {fileID: 4331185042199677927}
+    m_Position: {x: 618.3097, y: -44.39499, z: 0}
+  m_ChildStateMachines: []
+  m_AnyStateTransitions: []
+  m_EntryTransitions: []
+  m_StateMachineTransitions: {}
+  m_StateMachineBehaviours: []
+  m_AnyStatePosition: {x: 50, y: 20, z: 0}
+  m_EntryPosition: {x: 50, y: 120, z: 0}
+  m_ExitPosition: {x: 800, y: 120, z: 0}
+  m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
+  m_DefaultState: {fileID: 4331185042199677927}
+--- !u!206 &1172723464858944439
+BlendTree:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Blend Tree
+  m_Childs: []
+  m_BlendParameter: Blend
+  m_BlendParameterY: Blend
+  m_MinThreshold: 0
+  m_MaxThreshold: 1
+  m_UseAutomaticThresholds: 1
+  m_NormalizedBlendValues: 0
+  m_BlendType: 0
+--- !u!1102 &2773611772382125711
+AnimatorState:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Blend Tree
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions:
+  - {fileID: 6335697860175343713}
+  m_StateMachineBehaviours: []
+  m_Position: {x: 50, y: 50, z: 0}
+  m_IKOnFeet: 0
+  m_WriteDefaultValues: 1
+  m_Mirror: 0
+  m_SpeedParameterActive: 0
+  m_MirrorParameterActive: 0
+  m_CycleOffsetParameterActive: 0
+  m_TimeParameterActive: 0
+  m_Motion: {fileID: 1172723464858944439}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
 --- !u!1101 &2826909083587646716
 AnimatorStateTransition:
  m_ObjectHideFlags: 1
@ -360,7 +507,7 @@ AnimatorStateMachine:
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
-  m_Name: 1_Additive
+  m_Name: X_Additive
  m_ChildStates:
  - serializedVersion: 1
    m_State: {fileID: -3889880041459077057}
@ -378,6 +525,32 @@ AnimatorStateMachine:
  m_ExitPosition: {x: 800, y: 120, z: 0}
  m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
  m_DefaultState: {fileID: -3889880041459077057}
+--- !u!1102 &4331185042199677927
+AnimatorState:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: blendtree
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions: []
+  m_StateMachineBehaviours: []
+  m_Position: {x: 50, y: 50, z: 0}
+  m_IKOnFeet: 0
+  m_WriteDefaultValues: 1
+  m_Mirror: 0
+  m_SpeedParameterActive: 0
+  m_MirrorParameterActive: 0
+  m_CycleOffsetParameterActive: 0
+  m_TimeParameterActive: 0
+  m_Motion: {fileID: 20600000, guid: f2beba729514fc94eb1a78f8340a8738, type: 2}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
 --- !u!1102 &5369915444104545634
 AnimatorState:
  serializedVersion: 6
@ -426,6 +599,53 @@ AnimatorStateMachine:
  m_ExitPosition: {x: 800, y: 120, z: 0}
  m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
  m_DefaultState: {fileID: -8090073552076825221}
+--- !u!1107 &6073696076277274403
+AnimatorStateMachine:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: M_BlendTree_with_transitions
+  m_ChildStates:
+  - serializedVersion: 1
+    m_State: {fileID: 2773611772382125711}
+    m_Position: {x: 410, y: 60, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: 6922646542478255825}
+    m_Position: {x: 440, y: -60, z: 0}
+  m_ChildStateMachines: []
+  m_AnyStateTransitions: []
+  m_EntryTransitions: []
+  m_StateMachineTransitions: {}
+  m_StateMachineBehaviours: []
+  m_AnyStatePosition: {x: 50, y: 20, z: 0}
+  m_EntryPosition: {x: 50, y: 120, z: 0}
+  m_ExitPosition: {x: 800, y: 120, z: 0}
+  m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
+  m_DefaultState: {fileID: 2773611772382125711}
+--- !u!1101 &6335697860175343713
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions: []
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: 6922646542478255825}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0.25
+  m_TransitionOffset: 0
+  m_ExitTime: 0.75
+  m_HasExitTime: 1
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
 --- !u!1102 &6720833780093794278
 AnimatorState:
  serializedVersion: 6
@ -452,6 +672,32 @@ AnimatorState:
  m_MirrorParameter: 
  m_CycleOffsetParameter: 
  m_TimeParameter: 
+--- !u!1102 &6922646542478255825
+AnimatorState:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Blend Tree 0
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions: []
+  m_StateMachineBehaviours: []
+  m_Position: {x: 50, y: 50, z: 0}
+  m_IKOnFeet: 0
+  m_WriteDefaultValues: 1
+  m_Mirror: 0
+  m_SpeedParameterActive: 0
+  m_MirrorParameterActive: 0
+  m_CycleOffsetParameterActive: 0
+  m_TimeParameterActive: 0
+  m_Motion: {fileID: -3697568682967374507}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
 --- !u!1107 &7425114331284477142
 AnimatorStateMachine:
  serializedVersion: 6
@ -459,7 +705,7 @@ AnimatorStateMachine:
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
-  m_Name: 1_SingleMotion
+  m_Name: M_SingleMotion
  m_ChildStates:
  - serializedVersion: 1
    m_State: {fileID: -2269384398499780410}
@ -496,3 +742,40 @@ AnimatorStateMachine:
  m_ExitPosition: {x: 800, y: 120, z: 0}
  m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
  m_DefaultState: {fileID: -5198186050664669546}
+--- !u!1107 &8798472560561482739
+AnimatorStateMachine:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 1_BlendTree_InitialOff
+  m_ChildStates:
+  - serializedVersion: 1
+    m_State: {fileID: -4604261159886404567}
+    m_Position: {x: 460, y: 60, z: 0}
+  m_ChildStateMachines: []
+  m_AnyStateTransitions: []
+  m_EntryTransitions: []
+  m_StateMachineTransitions: {}
+  m_StateMachineBehaviours: []
+  m_AnyStatePosition: {x: 50, y: 20, z: 0}
+  m_EntryPosition: {x: 50, y: 120, z: 0}
+  m_ExitPosition: {x: 800, y: 120, z: 0}
+  m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
+  m_DefaultState: {fileID: -4604261159886404567}
+--- !u!206 &8886809958447648451
+BlendTree:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Blend Tree
+  m_Childs: []
+  m_BlendParameter: Blend
+  m_BlendParameterY: Blend
+  m_MinThreshold: 0
+  m_MaxThreshold: 1
+  m_UseAutomaticThresholds: 1
+  m_NormalizedBlendValues: 0
+  m_BlendType: 0
--- a/UnitTests~/MergeAnimatorTests/WriteDefaults/WriteDefaultsMergeTests.cs
+++ b/UnitTests~/MergeAnimatorTests/WriteDefaults/WriteDefaultsMergeTests.cs
@ -13,24 +13,33 @@ namespace UnitTests.MergeAnimatorTests.WriteDefaults
        [Test]
        public void TestWriteDefaultsMerge(
            [Values("WD_OFF", "WD_ON", "Ambiguous")] string scenario,
-            [Values(true, false)] bool mergeSetMode
+            [Values(true, false)] bool mergeAnimatorInitialState,
+            [Values(true, false)] bool matchWD
        )
        {
-            bool? wdMode;
+            bool? baseFxWdState;
            switch (scenario)
            {
-                case "WD_OFF": wdMode = false; break;
-                case "WD_ON": wdMode = true; break;
-                default: wdMode = null; break;
+                case "WD_OFF": baseFxWdState = false; break;
+                case "WD_ON": baseFxWdState = true; break;
+                default: baseFxWdState = null; break;
            }
+
+            // If the base layer is ambiguous and WD is disabled, the only thing we can assert is that nothing changed.
+            // This is kind of a pain, so... TODO
+            if (baseFxWdState == null && !matchWD) return;
            
            var root = CreateRoot(scenario);
            var m1 = CreateChild(root, "m1").AddComponent<ModularAvatarMergeAnimator>();
            var m2 = CreateChild(root, "m2").AddComponent<ModularAvatarMergeAnimator>();
            
+            // m1 provides the base FX layer for the avatar
            m1.animator = LoadAsset<AnimatorController>(scenario + ".controller");
            m1.mergeAnimatorMode = MergeAnimatorMode.Replace;
-            m2.animator = LoadAsset<AnimatorController>("TestSet_" + mergeSetMode + ".controller");
+            
+            m2.animator = LoadAsset<AnimatorController>("TestSet_" + mergeAnimatorInitialState + ".controller");
+            m2.mergeAnimatorMode = MergeAnimatorMode.Append;
+            m2.matchAvatarWriteDefaults = matchWD;
            
            AvatarProcessor.ProcessAvatar(root);
            
@ -46,8 +55,15 @@ namespace UnitTests.MergeAnimatorTests.WriteDefaults
                
                switch (layer.Name[0])
                {
-                    case 'M': expectedState = wdMode ?? mergeSetMode; break;
-                    case 'X': expectedState = mergeSetMode; break;
+                    // M layers: We expect to "M"atch WD state if the merge component is set to match WD (and a WD mode
+                    // was determined); otherwise, it should keep its original state.
+                    case 'M':
+                    {
+                        expectedState = (matchWD ? baseFxWdState : null) ?? mergeAnimatorInitialState;
+                        break;
+                    }
+                    case 'X': expectedState = mergeAnimatorInitialState; break;
+                    case '1': expectedState = true; break;
                    default: continue;
                }

--- a/UnitTests~/MergeAnimatorTests/WriteDefaults/blendtree.asset
+++ b/UnitTests~/MergeAnimatorTests/WriteDefaults/blendtree.asset
@ -0,0 +1,17 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!206 &20600000
+BlendTree:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: blendtree
+  m_Childs: []
+  m_BlendParameter: Blend
+  m_BlendParameterY: Blend
+  m_MinThreshold: 0
+  m_MaxThreshold: 1
+  m_UseAutomaticThresholds: 1
+  m_NormalizedBlendValues: 0
+  m_BlendType: 0
--- a/UnitTests~/MergeAnimatorTests/WriteDefaults/blendtree.asset.meta
+++ b/UnitTests~/MergeAnimatorTests/WriteDefaults/blendtree.asset.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: f2beba729514fc94eb1a78f8340a8738
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 20600000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/UnitTests~/ReactiveComponent/WD.meta
+++ b/UnitTests~/ReactiveComponent/WD.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 517a3e1b449bea941819c9902ce3de1b
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/UnitTests~/ReactiveComponent/WD/ReactiveComponentWriteDefaultsTest.cs
+++ b/UnitTests~/ReactiveComponent/WD/ReactiveComponentWriteDefaultsTest.cs
@ -0,0 +1,36 @@
+using System.Collections;
+using System.Collections.Generic;
+using modular_avatar_tests;
+using nadena.dev.modular_avatar.core.editor;
+using NUnit.Framework;
+using UnityEditor.Animations;
+using UnityEngine;
+using VRC.SDK3.Avatars.Components;
+
+public class ReactiveComponentWriteDefaultsTest : TestBase
+{
+    [Test]
+    public void RCObjectWriteDefaults([Values("rc_wd_on.controller", "rc_wd_off.controller")] string controllerPath)
+    {
+        var root = CreatePrefab("rc_wd.prefab");
+        var avDesc = root.GetComponent<VRCAvatarDescriptor>();
+        var controller = LoadAsset<AnimatorController>(controllerPath);
+        
+        var baseLayers = avDesc.baseAnimationLayers;
+        for (int i = 0; i < baseLayers.Length; i++)
+        {
+            baseLayers[i].animatorController = controller;
+            baseLayers[i].isDefault = false;
+        }
+        avDesc.baseAnimationLayers = baseLayers;
+        avDesc.customizeAnimationLayers = true;
+
+        AvatarProcessor.ProcessAvatar(root);
+
+        var fx = findFxLayer(root, "RC MA Responsive: GameObject");
+        Assert.AreEqual(
+            controllerPath.StartsWith("rc_wd_on"),
+            fx.stateMachine.defaultState.writeDefaultValues
+        );
+    }
+}
--- a/UnitTests~/ReactiveComponent/WD/ReactiveComponentWriteDefaultsTest.cs.meta
+++ b/UnitTests~/ReactiveComponent/WD/ReactiveComponentWriteDefaultsTest.cs.meta
@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 8efec892da3ae3a45b810abf5cebad02
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/UnitTests~/ReactiveComponent/WD/rc_wd.prefab
+++ b/UnitTests~/ReactiveComponent/WD/rc_wd.prefab
@ -0,0 +1,469 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &477583020495738404
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 9179158997175056572}
+  - component: {fileID: 29650048224569744}
+  - component: {fileID: 2852631459141447588}
+  - component: {fileID: 8587532856046952446}
+  m_Layer: 0
+  m_Name: GameObject OFF
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &9179158997175056572
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 477583020495738404}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 1878023628084695976}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &29650048224569744
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 477583020495738404}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: a162bb8ec7e24a5abcf457887f1df3fa, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_inverted: 0
+  m_objects:
+  - Object:
+      referencePath: GameObject
+      targetObject: {fileID: 6320927576634437802}
+    Active: 0
+--- !u!114 &2852631459141447588
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 477583020495738404}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3b29d45007c5493d926d2cd45a489529, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  Control:
+    name: GameObject OFF
+    icon: {fileID: 0}
+    type: 102
+    parameter:
+      name: 
+    value: 1
+    style: 0
+    subMenu: {fileID: 0}
+    subParameters: []
+    labels: []
+  MenuSource: 1
+  menuSource_otherObjectChildren: {fileID: 0}
+  isSynced: 1
+  isSaved: 1
+  isDefault: 0
+  automaticValue: 1
+  label: 
+--- !u!114 &8587532856046952446
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 477583020495738404}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 7ef83cb0c23d4d7c9d41021e544a1978, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  menuToAppend: {fileID: 0}
+  installTargetMenu: {fileID: 0}
+--- !u!1 &5779388316383907521
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1878023628084695976}
+  - component: {fileID: 7755083891606286594}
+  - component: {fileID: 586879300047358754}
+  - component: {fileID: 4246695544239537830}
+  - component: {fileID: 333680745927230906}
+  m_Layer: 0
+  m_Name: rc_wd
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1878023628084695976
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5779388316383907521}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: -0.22364601, y: 0.92672217, z: -1.631131}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 7508355110127128095}
+  - {fileID: 9179158997175056572}
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!95 &7755083891606286594
+Animator:
+  serializedVersion: 5
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5779388316383907521}
+  m_Enabled: 1
+  m_Avatar: {fileID: 0}
+  m_Controller: {fileID: 0}
+  m_CullingMode: 0
+  m_UpdateMode: 0
+  m_ApplyRootMotion: 0
+  m_LinearVelocityBlending: 0
+  m_StabilizeFeet: 0
+  m_WarningMessage: 
+  m_HasTransformHierarchy: 1
+  m_AllowConstantClipSamplingOptimization: 1
+  m_KeepAnimatorStateOnDisable: 0
+  m_WriteDefaultValuesOnDisable: 0
+--- !u!114 &586879300047358754
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5779388316383907521}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 542108242, guid: 67cc4cb7839cd3741b63733d5adf0442, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  Name: 
+  ViewPosition: {x: 0, y: 1.6, z: 0.2}
+  Animations: 0
+  ScaleIPD: 1
+  lipSync: 0
+  lipSyncJawBone: {fileID: 0}
+  lipSyncJawClosed: {x: 0, y: 0, z: 0, w: 1}
+  lipSyncJawOpen: {x: 0, y: 0, z: 0, w: 1}
+  VisemeSkinnedMesh: {fileID: 0}
+  MouthOpenBlendShapeName: Facial_Blends.Jaw_Down
+  VisemeBlendShapes: []
+  unityVersion: 
+  portraitCameraPositionOffset: {x: 0, y: 0, z: 0}
+  portraitCameraRotationOffset: {x: 0, y: 1, z: 0, w: -0.00000004371139}
+  networkIDs: []
+  customExpressions: 0
+  expressionsMenu: {fileID: 0}
+  expressionParameters: {fileID: 0}
+  enableEyeLook: 0
+  customEyeLookSettings:
+    eyeMovement:
+      confidence: 0.5
+      excitement: 0.5
+    leftEye: {fileID: 0}
+    rightEye: {fileID: 0}
+    eyesLookingStraight:
+      linked: 1
+      left: {x: 0, y: 0, z: 0, w: 0}
+      right: {x: 0, y: 0, z: 0, w: 0}
+    eyesLookingUp:
+      linked: 1
+      left: {x: 0, y: 0, z: 0, w: 0}
+      right: {x: 0, y: 0, z: 0, w: 0}
+    eyesLookingDown:
+      linked: 1
+      left: {x: 0, y: 0, z: 0, w: 0}
+      right: {x: 0, y: 0, z: 0, w: 0}
+    eyesLookingLeft:
+      linked: 1
+      left: {x: 0, y: 0, z: 0, w: 0}
+      right: {x: 0, y: 0, z: 0, w: 0}
+    eyesLookingRight:
+      linked: 1
+      left: {x: 0, y: 0, z: 0, w: 0}
+      right: {x: 0, y: 0, z: 0, w: 0}
+    eyelidType: 0
+    upperLeftEyelid: {fileID: 0}
+    upperRightEyelid: {fileID: 0}
+    lowerLeftEyelid: {fileID: 0}
+    lowerRightEyelid: {fileID: 0}
+    eyelidsDefault:
+      upper:
+        linked: 1
+        left: {x: 0, y: 0, z: 0, w: 0}
+        right: {x: 0, y: 0, z: 0, w: 0}
+      lower:
+        linked: 1
+        left: {x: 0, y: 0, z: 0, w: 0}
+        right: {x: 0, y: 0, z: 0, w: 0}
+    eyelidsClosed:
+      upper:
+        linked: 1
+        left: {x: 0, y: 0, z: 0, w: 0}
+        right: {x: 0, y: 0, z: 0, w: 0}
+      lower:
+        linked: 1
+        left: {x: 0, y: 0, z: 0, w: 0}
+        right: {x: 0, y: 0, z: 0, w: 0}
+    eyelidsLookingUp:
+      upper:
+        linked: 1
+        left: {x: 0, y: 0, z: 0, w: 0}
+        right: {x: 0, y: 0, z: 0, w: 0}
+      lower:
+        linked: 1
+        left: {x: 0, y: 0, z: 0, w: 0}
+        right: {x: 0, y: 0, z: 0, w: 0}
+    eyelidsLookingDown:
+      upper:
+        linked: 1
+        left: {x: 0, y: 0, z: 0, w: 0}
+        right: {x: 0, y: 0, z: 0, w: 0}
+      lower:
+        linked: 1
+        left: {x: 0, y: 0, z: 0, w: 0}
+        right: {x: 0, y: 0, z: 0, w: 0}
+    eyelidsSkinnedMesh: {fileID: 0}
+    eyelidsBlendshapes: 
+  customizeAnimationLayers: 1
+  baseAnimationLayers:
+  - isEnabled: 0
+    type: 0
+    animatorController: {fileID: 9100000, guid: bbe8f5d0b8aa75b46a8da9da84fca5f0,
+      type: 2}
+    mask: {fileID: 0}
+    isDefault: 0
+  - isEnabled: 0
+    type: 4
+    animatorController: {fileID: 9100000, guid: bbe8f5d0b8aa75b46a8da9da84fca5f0,
+      type: 2}
+    mask: {fileID: 0}
+    isDefault: 0
+  - isEnabled: 0
+    type: 5
+    animatorController: {fileID: 9100000, guid: bbe8f5d0b8aa75b46a8da9da84fca5f0,
+      type: 2}
+    mask: {fileID: 0}
+    isDefault: 0
+  specialAnimationLayers:
+  - isEnabled: 0
+    type: 6
+    animatorController: {fileID: 0}
+    mask: {fileID: 0}
+    isDefault: 1
+  - isEnabled: 0
+    type: 7
+    animatorController: {fileID: 0}
+    mask: {fileID: 0}
+    isDefault: 1
+  - isEnabled: 0
+    type: 8
+    animatorController: {fileID: 0}
+    mask: {fileID: 0}
+    isDefault: 1
+  AnimationPreset: {fileID: 0}
+  animationHashSet: []
+  autoFootsteps: 1
+  autoLocomotion: 1
+  collider_head:
+    isMirrored: 1
+    state: 0
+    transform: {fileID: 0}
+    radius: 0
+    height: 0
+    position: {x: 0, y: 0, z: 0}
+    rotation: {x: 0, y: 0, z: 0, w: 1}
+  collider_torso:
+    isMirrored: 1
+    state: 0
+    transform: {fileID: 0}
+    radius: 0
+    height: 0
+    position: {x: 0, y: 0, z: 0}
+    rotation: {x: 0, y: 0, z: 0, w: 1}
+  collider_footR:
+    isMirrored: 1
+    state: 0
+    transform: {fileID: 0}
+    radius: 0
+    height: 0
+    position: {x: 0, y: 0, z: 0}
+    rotation: {x: 0, y: 0, z: 0, w: 1}
+  collider_footL:
+    isMirrored: 1
+    state: 0
+    transform: {fileID: 0}
+    radius: 0
+    height: 0
+    position: {x: 0, y: 0, z: 0}
+    rotation: {x: 0, y: 0, z: 0, w: 1}
+  collider_handR:
+    isMirrored: 1
+    state: 0
+    transform: {fileID: 0}
+    radius: 0
+    height: 0
+    position: {x: 0, y: 0, z: 0}
+    rotation: {x: 0, y: 0, z: 0, w: 1}
+  collider_handL:
+    isMirrored: 1
+    state: 0
+    transform: {fileID: 0}
+    radius: 0
+    height: 0
+    position: {x: 0, y: 0, z: 0}
+    rotation: {x: 0, y: 0, z: 0, w: 1}
+  collider_fingerIndexL:
+    isMirrored: 1
+    state: 0
+    transform: {fileID: 0}
+    radius: 0
+    height: 0
+    position: {x: 0, y: 0, z: 0}
+    rotation: {x: 0, y: 0, z: 0, w: 1}
+  collider_fingerMiddleL:
+    isMirrored: 1
+    state: 0
+    transform: {fileID: 0}
+    radius: 0
+    height: 0
+    position: {x: 0, y: 0, z: 0}
+    rotation: {x: 0, y: 0, z: 0, w: 1}
+  collider_fingerRingL:
+    isMirrored: 1
+    state: 0
+    transform: {fileID: 0}
+    radius: 0
+    height: 0
+    position: {x: 0, y: 0, z: 0}
+    rotation: {x: 0, y: 0, z: 0, w: 1}
+  collider_fingerLittleL:
+    isMirrored: 1
+    state: 0
+    transform: {fileID: 0}
+    radius: 0
+    height: 0
+    position: {x: 0, y: 0, z: 0}
+    rotation: {x: 0, y: 0, z: 0, w: 1}
+  collider_fingerIndexR:
+    isMirrored: 1
+    state: 0
+    transform: {fileID: 0}
+    radius: 0
+    height: 0
+    position: {x: 0, y: 0, z: 0}
+    rotation: {x: 0, y: 0, z: 0, w: 1}
+  collider_fingerMiddleR:
+    isMirrored: 1
+    state: 0
+    transform: {fileID: 0}
+    radius: 0
+    height: 0
+    position: {x: 0, y: 0, z: 0}
+    rotation: {x: 0, y: 0, z: 0, w: 1}
+  collider_fingerRingR:
+    isMirrored: 1
+    state: 0
+    transform: {fileID: 0}
+    radius: 0
+    height: 0
+    position: {x: 0, y: 0, z: 0}
+    rotation: {x: 0, y: 0, z: 0, w: 1}
+  collider_fingerLittleR:
+    isMirrored: 1
+    state: 0
+    transform: {fileID: 0}
+    radius: 0
+    height: 0
+    position: {x: 0, y: 0, z: 0}
+    rotation: {x: 0, y: 0, z: 0, w: 1}
+--- !u!114 &4246695544239537830
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5779388316383907521}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: -1427037861, guid: 4ecd63eff847044b68db9453ce219299, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  launchedFromSDKPipeline: 0
+  completedSDKPipeline: 0
+  blueprintId: 
+  contentType: 0
+  assetBundleUnityVersion: 
+  fallbackStatus: 0
+--- !u!114 &333680745927230906
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5779388316383907521}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 52fa21b17bc14dc294959f976e3e184f, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!1 &6320927576634437802
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7508355110127128095}
+  m_Layer: 0
+  m_Name: GameObject
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &7508355110127128095
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6320927576634437802}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 1878023628084695976}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- a/UnitTests~/ReactiveComponent/WD/rc_wd.prefab.meta
+++ b/UnitTests~/ReactiveComponent/WD/rc_wd.prefab.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 7b345973f37afde43945770cff0f468d
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/UnitTests~/ReactiveComponent/WD/rc_wd_off.controller
+++ b/UnitTests~/ReactiveComponent/WD/rc_wd_off.controller
@ -0,0 +1,72 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1102 &-5675820832765795809
+AnimatorState:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: New State
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions: []
+  m_StateMachineBehaviours: []
+  m_Position: {x: 50, y: 50, z: 0}
+  m_IKOnFeet: 0
+  m_WriteDefaultValues: 0
+  m_Mirror: 0
+  m_SpeedParameterActive: 0
+  m_MirrorParameterActive: 0
+  m_CycleOffsetParameterActive: 0
+  m_TimeParameterActive: 0
+  m_Motion: {fileID: 0}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
+--- !u!1107 &-1329585102462520777
+AnimatorStateMachine:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Base Layer
+  m_ChildStates:
+  - serializedVersion: 1
+    m_State: {fileID: -5675820832765795809}
+    m_Position: {x: 370, y: 110, z: 0}
+  m_ChildStateMachines: []
+  m_AnyStateTransitions: []
+  m_EntryTransitions: []
+  m_StateMachineTransitions: {}
+  m_StateMachineBehaviours: []
+  m_AnyStatePosition: {x: 50, y: 20, z: 0}
+  m_EntryPosition: {x: 50, y: 120, z: 0}
+  m_ExitPosition: {x: 800, y: 120, z: 0}
+  m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
+  m_DefaultState: {fileID: -5675820832765795809}
+--- !u!91 &9100000
+AnimatorController:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: rc_wd_off
+  serializedVersion: 5
+  m_AnimatorParameters: []
+  m_AnimatorLayers:
+  - serializedVersion: 5
+    m_Name: Base Layer
+    m_StateMachine: {fileID: -1329585102462520777}
+    m_Mask: {fileID: 0}
+    m_Motions: []
+    m_Behaviours: []
+    m_BlendingMode: 0
+    m_SyncedLayerIndex: -1
+    m_DefaultWeight: 0
+    m_IKPass: 0
+    m_SyncedLayerAffectsTiming: 0
+    m_Controller: {fileID: 9100000}
--- a/UnitTests~/ReactiveComponent/WD/rc_wd_off.controller.meta
+++ b/UnitTests~/ReactiveComponent/WD/rc_wd_off.controller.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: bbe8f5d0b8aa75b46a8da9da84fca5f0
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 9100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/UnitTests~/ReactiveComponent/WD/rc_wd_on.controller
+++ b/UnitTests~/ReactiveComponent/WD/rc_wd_on.controller
@ -0,0 +1,72 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1102 &-5675820832765795809
+AnimatorState:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: New State
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions: []
+  m_StateMachineBehaviours: []
+  m_Position: {x: 50, y: 50, z: 0}
+  m_IKOnFeet: 0
+  m_WriteDefaultValues: 1
+  m_Mirror: 0
+  m_SpeedParameterActive: 0
+  m_MirrorParameterActive: 0
+  m_CycleOffsetParameterActive: 0
+  m_TimeParameterActive: 0
+  m_Motion: {fileID: 0}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
+--- !u!1107 &-1329585102462520777
+AnimatorStateMachine:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Base Layer
+  m_ChildStates:
+  - serializedVersion: 1
+    m_State: {fileID: -5675820832765795809}
+    m_Position: {x: 370, y: 110, z: 0}
+  m_ChildStateMachines: []
+  m_AnyStateTransitions: []
+  m_EntryTransitions: []
+  m_StateMachineTransitions: {}
+  m_StateMachineBehaviours: []
+  m_AnyStatePosition: {x: 50, y: 20, z: 0}
+  m_EntryPosition: {x: 50, y: 120, z: 0}
+  m_ExitPosition: {x: 800, y: 120, z: 0}
+  m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
+  m_DefaultState: {fileID: -5675820832765795809}
+--- !u!91 &9100000
+AnimatorController:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: rc_wd_on
+  serializedVersion: 5
+  m_AnimatorParameters: []
+  m_AnimatorLayers:
+  - serializedVersion: 5
+    m_Name: Base Layer
+    m_StateMachine: {fileID: -1329585102462520777}
+    m_Mask: {fileID: 0}
+    m_Motions: []
+    m_Behaviours: []
+    m_BlendingMode: 0
+    m_SyncedLayerIndex: -1
+    m_DefaultWeight: 0
+    m_IKPass: 0
+    m_SyncedLayerAffectsTiming: 0
+    m_Controller: {fileID: 9100000}
--- a/UnitTests~/ReactiveComponent/WD/rc_wd_on.controller.meta
+++ b/UnitTests~/ReactiveComponent/WD/rc_wd_on.controller.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 7fdfd4d33b132ab45b23f92ec3535b94
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 9100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/UnitTests~/RenameParametersTests/RenameParametersTests.cs
+++ b/UnitTests~/RenameParametersTests/RenameParametersTests.cs
@ -9,6 +9,7 @@ using nadena.dev.modular_avatar.core.editor;
 using nadena.dev.ndmf;
 using nadena.dev.ndmf.animator;
 using NUnit.Framework;
+using UnityEditor;
 using UnityEditor.Animations;
 using UnityEngine;
 using VRC.SDK3.Avatars.Components;
@ -63,8 +64,8 @@ namespace modular_avatar_tests.RenameParametersTests
            AvatarProcessor.ProcessAvatar(prefab);

            var menu = prefab.GetComponent<VRCAvatarDescriptor>().expressionsMenu;
-            Assert.AreEqual("test$$Internal_0", menu.controls[0].parameter.name);
-            Assert.AreEqual("test$$Internal_0", menu.controls[1].subMenu.controls[0].parameter.name);
+            Assert.AreEqual("test$33bf6fbd7cd8", menu.controls[0].parameter.name);
+            Assert.AreEqual("test$33bf6fbd7cd8", menu.controls[1].subMenu.controls[0].parameter.name);
        }

        [Test]
@ -107,7 +108,7 @@ namespace modular_avatar_tests.RenameParametersTests
                .Select(e => e.TheError)
                .Cast<SimpleError>()
                .First(e => e.TitleKey == "error.rename_params.default_value_conflict");
-            Assert.AreEqual("a$$Internal_1", valueConflict.DetailsSubst[0]);
+            Assert.AreEqual("a$014659ab9d98", valueConflict.DetailsSubst[0]);
            Assert.AreEqual("0", valueConflict.DetailsSubst[1]);
            Assert.AreEqual("1", valueConflict.DetailsSubst[2]);
            
@ -119,7 +120,7 @@ namespace modular_avatar_tests.RenameParametersTests
                .Cast<SimpleError>()
                .First(e => e.TitleKey == "error.rename_params.type_conflict");
            
-            Assert.AreEqual("a$$Internal_2", typeConflict.DetailsSubst[0]);
+            Assert.AreEqual("a$88c01afc056a", typeConflict.DetailsSubst[0]);
            Assert.AreEqual("Int", typeConflict.DetailsSubst[1]);
            Assert.AreEqual("Float", typeConflict.DetailsSubst[2]);
            
@ -361,6 +362,43 @@ namespace modular_avatar_tests.RenameParametersTests
            
            Assert.IsFalse(expParams["a"].networkSynced);
        }
+
+        [Test]
+        public void RenamesParameterCurves_InMergeAnimator()
+        {
+            var prefab = CreatePrefab("RenamesParameterCurves.prefab");
+            AvatarProcessor.ProcessAvatar(prefab);
+            
+            var fx = prefab.GetComponent<VRCAvatarDescriptor>().baseAnimationLayers
+                .First(l => l.type == VRCAvatarDescriptor.AnimLayerType.FX)
+                .animatorController as AnimatorController;
+
+            var state = fx.layers.First(l => l.name == "test").stateMachine.defaultState;
+            var motion = (AnimationClip)state.motion;
+
+            var bindings = AnimationUtility.GetCurveBindings(motion);
+            var theBinding = bindings[0];
+            Assert.AreEqual("test2", theBinding.propertyName);
+        }
+        
+        [Test]
+        public void RenamesParameterCurves_InMergeMotion()
+        {
+            var prefab = CreatePrefab("RenamesParameterCurves.prefab");
+            AvatarProcessor.ProcessAvatar(prefab);
+            
+            var fx = prefab.GetComponent<VRCAvatarDescriptor>().baseAnimationLayers
+                .First(l => l.type == VRCAvatarDescriptor.AnimLayerType.FX)
+                .animatorController as AnimatorController;
+
+            var state = fx.layers[0].stateMachine.defaultState;
+            var tree = (BlendTree)state.motion;
+            var motion = (AnimationClip)tree.children[0].motion;
+
+            var bindings = AnimationUtility.GetCurveBindings(motion);
+            var theBinding = bindings[0];
+            Assert.AreEqual("test2", theBinding.propertyName);
+        }
    }
 }

--- a/UnitTests~/RenameParametersTests/RenamesParameterCurves.anim
+++ b/UnitTests~/RenameParametersTests/RenamesParameterCurves.anim
@ -0,0 +1,122 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!74 &7400000
+AnimationClip:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: RenamesParameterCurves
+  serializedVersion: 7
+  m_Legacy: 0
+  m_Compressed: 0
+  m_UseHighQualityCurve: 1
+  m_RotationCurves: []
+  m_CompressedRotationCurves: []
+  m_EulerCurves: []
+  m_PositionCurves: []
+  m_ScaleCurves: []
+  m_FloatCurves:
+  - serializedVersion: 2
+    curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 1
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: test
+    path: 
+    classID: 95
+    script: {fileID: 0}
+    flags: 16
+  m_PPtrCurves: []
+  m_SampleRate: 60
+  m_WrapMode: 0
+  m_Bounds:
+    m_Center: {x: 0, y: 0, z: 0}
+    m_Extent: {x: 0, y: 0, z: 0}
+  m_ClipBindingConstant:
+    genericBindings:
+    - serializedVersion: 2
+      path: 0
+      attribute: 3632233996
+      script: {fileID: 0}
+      typeID: 95
+      customType: 0
+      isPPtrCurve: 0
+      isIntCurve: 0
+      isSerializeReferenceCurve: 0
+    pptrCurveMapping: []
+  m_AnimationClipSettings:
+    serializedVersion: 2
+    m_AdditiveReferencePoseClip: {fileID: 0}
+    m_AdditiveReferencePoseTime: 0
+    m_StartTime: 0
+    m_StopTime: 1
+    m_OrientationOffsetY: 0
+    m_Level: 0
+    m_CycleOffset: 0
+    m_HasAdditiveReferencePose: 0
+    m_LoopTime: 0
+    m_LoopBlend: 0
+    m_LoopBlendOrientation: 0
+    m_LoopBlendPositionY: 0
+    m_LoopBlendPositionXZ: 0
+    m_KeepOriginalOrientation: 0
+    m_KeepOriginalPositionY: 1
+    m_KeepOriginalPositionXZ: 0
+    m_HeightFromFeet: 0
+    m_Mirror: 0
+  m_EditorCurves:
+  - serializedVersion: 2
+    curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 1
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: test
+    path: 
+    classID: 95
+    script: {fileID: 0}
+    flags: 16
+  m_EulerEditorCurves: []
+  m_HasGenericRootTransform: 0
+  m_HasMotionFloatCurves: 0
+  m_Events: []
--- a/UnitTests~/RenameParametersTests/RenamesParameterCurves.anim.meta
+++ b/UnitTests~/RenameParametersTests/RenamesParameterCurves.anim.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 3e634bde80c3a60459004323512f089f
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 7400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/UnitTests~/RenameParametersTests/RenamesParameterCurves.controller
+++ b/UnitTests~/RenameParametersTests/RenamesParameterCurves.controller
@ -0,0 +1,78 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1107 &-3650133622313043183
+AnimatorStateMachine:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: test
+  m_ChildStates:
+  - serializedVersion: 1
+    m_State: {fileID: 1164923829880529754}
+    m_Position: {x: 400, y: 110, z: 0}
+  m_ChildStateMachines: []
+  m_AnyStateTransitions: []
+  m_EntryTransitions: []
+  m_StateMachineTransitions: {}
+  m_StateMachineBehaviours: []
+  m_AnyStatePosition: {x: 50, y: 20, z: 0}
+  m_EntryPosition: {x: 50, y: 120, z: 0}
+  m_ExitPosition: {x: 800, y: 120, z: 0}
+  m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
+  m_DefaultState: {fileID: 1164923829880529754}
+--- !u!91 &9100000
+AnimatorController:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: RenamesParameterCurves
+  serializedVersion: 5
+  m_AnimatorParameters:
+  - m_Name: test
+    m_Type: 1
+    m_DefaultFloat: 0
+    m_DefaultInt: 0
+    m_DefaultBool: 0
+    m_Controller: {fileID: 9100000}
+  m_AnimatorLayers:
+  - serializedVersion: 5
+    m_Name: test
+    m_StateMachine: {fileID: -3650133622313043183}
+    m_Mask: {fileID: 0}
+    m_Motions: []
+    m_Behaviours: []
+    m_BlendingMode: 0
+    m_SyncedLayerIndex: -1
+    m_DefaultWeight: 0
+    m_IKPass: 0
+    m_SyncedLayerAffectsTiming: 0
+    m_Controller: {fileID: 9100000}
+--- !u!1102 &1164923829880529754
+AnimatorState:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: RenamesParameterCurves
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions: []
+  m_StateMachineBehaviours: []
+  m_Position: {x: 50, y: 50, z: 0}
+  m_IKOnFeet: 0
+  m_WriteDefaultValues: 1
+  m_Mirror: 0
+  m_SpeedParameterActive: 0
+  m_MirrorParameterActive: 0
+  m_CycleOffsetParameterActive: 0
+  m_TimeParameterActive: 0
+  m_Motion: {fileID: 7400000, guid: 3e634bde80c3a60459004323512f089f, type: 2}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
--- a/UnitTests~/RenameParametersTests/RenamesParameterCurves.controller.meta
+++ b/UnitTests~/RenameParametersTests/RenamesParameterCurves.controller.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: e5e810f5227b26d4b9f073f3104d98c9
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 9100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/UnitTests~/RenameParametersTests/RenamesParameterCurves.prefab
+++ b/UnitTests~/RenameParametersTests/RenamesParameterCurves.prefab
@ -0,0 +1,421 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &1286613399393800329
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6360067973014650773}
+  - component: {fileID: 1169826671884431870}
+  - component: {fileID: 4500738523828848987}
+  - component: {fileID: 1948104033237066197}
+  m_Layer: 0
+  m_Name: RenamesParameterCurves
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &6360067973014650773
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1286613399393800329}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: -0.3605362, y: 0.62606794, z: -0.29746842}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 4505660406486375176}
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!95 &1169826671884431870
+Animator:
+  serializedVersion: 5
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1286613399393800329}
+  m_Enabled: 1
+  m_Avatar: {fileID: 0}
+  m_Controller: {fileID: 9100000, guid: e5e810f5227b26d4b9f073f3104d98c9, type: 2}
+  m_CullingMode: 0
+  m_UpdateMode: 0
+  m_ApplyRootMotion: 0
+  m_LinearVelocityBlending: 0
+  m_StabilizeFeet: 0
+  m_WarningMessage: 
+  m_HasTransformHierarchy: 1
+  m_AllowConstantClipSamplingOptimization: 1
+  m_KeepAnimatorStateOnDisable: 0
+  m_WriteDefaultValuesOnDisable: 0
+--- !u!114 &4500738523828848987
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1286613399393800329}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 542108242, guid: 67cc4cb7839cd3741b63733d5adf0442, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  Name: 
+  ViewPosition: {x: 0, y: 1.6, z: 0.2}
+  Animations: 0
+  ScaleIPD: 1
+  lipSync: 0
+  lipSyncJawBone: {fileID: 0}
+  lipSyncJawClosed: {x: 0, y: 0, z: 0, w: 1}
+  lipSyncJawOpen: {x: 0, y: 0, z: 0, w: 1}
+  VisemeSkinnedMesh: {fileID: 0}
+  MouthOpenBlendShapeName: Facial_Blends.Jaw_Down
+  VisemeBlendShapes: []
+  unityVersion: 
+  portraitCameraPositionOffset: {x: 0, y: 0, z: 0}
+  portraitCameraRotationOffset: {x: 0, y: 1, z: 0, w: -0.00000004371139}
+  networkIDs: []
+  customExpressions: 0
+  expressionsMenu: {fileID: 0}
+  expressionParameters: {fileID: 0}
+  enableEyeLook: 0
+  customEyeLookSettings:
+    eyeMovement:
+      confidence: 0.5
+      excitement: 0.5
+    leftEye: {fileID: 0}
+    rightEye: {fileID: 0}
+    eyesLookingStraight:
+      linked: 1
+      left: {x: 0, y: 0, z: 0, w: 0}
+      right: {x: 0, y: 0, z: 0, w: 0}
+    eyesLookingUp:
+      linked: 1
+      left: {x: 0, y: 0, z: 0, w: 0}
+      right: {x: 0, y: 0, z: 0, w: 0}
+    eyesLookingDown:
+      linked: 1
+      left: {x: 0, y: 0, z: 0, w: 0}
+      right: {x: 0, y: 0, z: 0, w: 0}
+    eyesLookingLeft:
+      linked: 1
+      left: {x: 0, y: 0, z: 0, w: 0}
+      right: {x: 0, y: 0, z: 0, w: 0}
+    eyesLookingRight:
+      linked: 1
+      left: {x: 0, y: 0, z: 0, w: 0}
+      right: {x: 0, y: 0, z: 0, w: 0}
+    eyelidType: 0
+    upperLeftEyelid: {fileID: 0}
+    upperRightEyelid: {fileID: 0}
+    lowerLeftEyelid: {fileID: 0}
+    lowerRightEyelid: {fileID: 0}
+    eyelidsDefault:
+      upper:
+        linked: 1
+        left: {x: 0, y: 0, z: 0, w: 0}
+        right: {x: 0, y: 0, z: 0, w: 0}
+      lower:
+        linked: 1
+        left: {x: 0, y: 0, z: 0, w: 0}
+        right: {x: 0, y: 0, z: 0, w: 0}
+    eyelidsClosed:
+      upper:
+        linked: 1
+        left: {x: 0, y: 0, z: 0, w: 0}
+        right: {x: 0, y: 0, z: 0, w: 0}
+      lower:
+        linked: 1
+        left: {x: 0, y: 0, z: 0, w: 0}
+        right: {x: 0, y: 0, z: 0, w: 0}
+    eyelidsLookingUp:
+      upper:
+        linked: 1
+        left: {x: 0, y: 0, z: 0, w: 0}
+        right: {x: 0, y: 0, z: 0, w: 0}
+      lower:
+        linked: 1
+        left: {x: 0, y: 0, z: 0, w: 0}
+        right: {x: 0, y: 0, z: 0, w: 0}
+    eyelidsLookingDown:
+      upper:
+        linked: 1
+        left: {x: 0, y: 0, z: 0, w: 0}
+        right: {x: 0, y: 0, z: 0, w: 0}
+      lower:
+        linked: 1
+        left: {x: 0, y: 0, z: 0, w: 0}
+        right: {x: 0, y: 0, z: 0, w: 0}
+    eyelidsSkinnedMesh: {fileID: 0}
+    eyelidsBlendshapes: 
+  customizeAnimationLayers: 0
+  baseAnimationLayers:
+  - isEnabled: 0
+    type: 0
+    animatorController: {fileID: 0}
+    mask: {fileID: 0}
+    isDefault: 1
+  - isEnabled: 0
+    type: 4
+    animatorController: {fileID: 0}
+    mask: {fileID: 0}
+    isDefault: 1
+  - isEnabled: 0
+    type: 5
+    animatorController: {fileID: 0}
+    mask: {fileID: 0}
+    isDefault: 1
+  specialAnimationLayers:
+  - isEnabled: 0
+    type: 6
+    animatorController: {fileID: 0}
+    mask: {fileID: 0}
+    isDefault: 1
+  - isEnabled: 0
+    type: 7
+    animatorController: {fileID: 0}
+    mask: {fileID: 0}
+    isDefault: 1
+  - isEnabled: 0
+    type: 8
+    animatorController: {fileID: 0}
+    mask: {fileID: 0}
+    isDefault: 1
+  AnimationPreset: {fileID: 0}
+  animationHashSet: []
+  autoFootsteps: 1
+  autoLocomotion: 1
+  collider_head:
+    isMirrored: 1
+    state: 0
+    transform: {fileID: 0}
+    radius: 0
+    height: 0
+    position: {x: 0, y: 0, z: 0}
+    rotation: {x: 0, y: 0, z: 0, w: 1}
+  collider_torso:
+    isMirrored: 1
+    state: 0
+    transform: {fileID: 0}
+    radius: 0
+    height: 0
+    position: {x: 0, y: 0, z: 0}
+    rotation: {x: 0, y: 0, z: 0, w: 1}
+  collider_footR:
+    isMirrored: 1
+    state: 0
+    transform: {fileID: 0}
+    radius: 0
+    height: 0
+    position: {x: 0, y: 0, z: 0}
+    rotation: {x: 0, y: 0, z: 0, w: 1}
+  collider_footL:
+    isMirrored: 1
+    state: 0
+    transform: {fileID: 0}
+    radius: 0
+    height: 0
+    position: {x: 0, y: 0, z: 0}
+    rotation: {x: 0, y: 0, z: 0, w: 1}
+  collider_handR:
+    isMirrored: 1
+    state: 0
+    transform: {fileID: 0}
+    radius: 0
+    height: 0
+    position: {x: 0, y: 0, z: 0}
+    rotation: {x: 0, y: 0, z: 0, w: 1}
+  collider_handL:
+    isMirrored: 1
+    state: 0
+    transform: {fileID: 0}
+    radius: 0
+    height: 0
+    position: {x: 0, y: 0, z: 0}
+    rotation: {x: 0, y: 0, z: 0, w: 1}
+  collider_fingerIndexL:
+    isMirrored: 1
+    state: 0
+    transform: {fileID: 0}
+    radius: 0
+    height: 0
+    position: {x: 0, y: 0, z: 0}
+    rotation: {x: 0, y: 0, z: 0, w: 1}
+  collider_fingerMiddleL:
+    isMirrored: 1
+    state: 0
+    transform: {fileID: 0}
+    radius: 0
+    height: 0
+    position: {x: 0, y: 0, z: 0}
+    rotation: {x: 0, y: 0, z: 0, w: 1}
+  collider_fingerRingL:
+    isMirrored: 1
+    state: 0
+    transform: {fileID: 0}
+    radius: 0
+    height: 0
+    position: {x: 0, y: 0, z: 0}
+    rotation: {x: 0, y: 0, z: 0, w: 1}
+  collider_fingerLittleL:
+    isMirrored: 1
+    state: 0
+    transform: {fileID: 0}
+    radius: 0
+    height: 0
+    position: {x: 0, y: 0, z: 0}
+    rotation: {x: 0, y: 0, z: 0, w: 1}
+  collider_fingerIndexR:
+    isMirrored: 1
+    state: 0
+    transform: {fileID: 0}
+    radius: 0
+    height: 0
+    position: {x: 0, y: 0, z: 0}
+    rotation: {x: 0, y: 0, z: 0, w: 1}
+  collider_fingerMiddleR:
+    isMirrored: 1
+    state: 0
+    transform: {fileID: 0}
+    radius: 0
+    height: 0
+    position: {x: 0, y: 0, z: 0}
+    rotation: {x: 0, y: 0, z: 0, w: 1}
+  collider_fingerRingR:
+    isMirrored: 1
+    state: 0
+    transform: {fileID: 0}
+    radius: 0
+    height: 0
+    position: {x: 0, y: 0, z: 0}
+    rotation: {x: 0, y: 0, z: 0, w: 1}
+  collider_fingerLittleR:
+    isMirrored: 1
+    state: 0
+    transform: {fileID: 0}
+    radius: 0
+    height: 0
+    position: {x: 0, y: 0, z: 0}
+    rotation: {x: 0, y: 0, z: 0, w: 1}
+--- !u!114 &1948104033237066197
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1286613399393800329}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: -1427037861, guid: 4ecd63eff847044b68db9453ce219299, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  launchedFromSDKPipeline: 0
+  completedSDKPipeline: 0
+  blueprintId: 
+  contentType: 0
+  assetBundleUnityVersion: 
+  fallbackStatus: 0
+--- !u!1 &7373036613593428732
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4505660406486375176}
+  - component: {fileID: 8305268802043251198}
+  - component: {fileID: 7024896843461383305}
+  - component: {fileID: 1430232598996062774}
+  m_Layer: 0
+  m_Name: GameObject
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &4505660406486375176
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7373036613593428732}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 6360067973014650773}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &8305268802043251198
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7373036613593428732}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 71a96d4ea0c344f39e277d82035bf9bd, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  parameters:
+  - nameOrPrefix: test
+    remapTo: test2
+    internalParameter: 0
+    isPrefix: 0
+    syncType: 0
+    localOnly: 0
+    defaultValue: 0
+    saved: 0
+    hasExplicitDefaultValue: 0
+    m_overrideAnimatorDefaults: 0
+--- !u!114 &7024896843461383305
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7373036613593428732}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1bb122659f724ebf85fe095ac02dc339, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  animator: {fileID: 9100000, guid: e5e810f5227b26d4b9f073f3104d98c9, type: 2}
+  layerType: 5
+  deleteAttachedAnimator: 1
+  pathMode: 1
+  matchAvatarWriteDefaults: 0
+  relativePathRoot:
+    referencePath: 
+    targetObject: {fileID: 0}
+  layerPriority: 0
+  mergeAnimatorMode: 0
+--- !u!114 &1430232598996062774
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7373036613593428732}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 229dd561ca024a6588e388160921a70f, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  BlendTree: {fileID: 7400000, guid: 3e634bde80c3a60459004323512f089f, type: 2}
+  PathMode: 0
+  RelativePathRoot:
+    referencePath: 
+    targetObject: {fileID: 0}
--- a/UnitTests~/RenameParametersTests/RenamesParameterCurves.prefab.meta
+++ b/UnitTests~/RenameParametersTests/RenamesParameterCurves.prefab.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 63b6943a609971c41b031752630990e5
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/docs~/docs/general-behavior/mmd.md
+++ b/docs~/docs/general-behavior/mmd.md
@ -12,6 +12,9 @@ Layers added via Merge Animator (even in replace mode) will not be affected by t
 padding layers will be added to protect them. If you want to opt them into this behavior, you can attach the `MA MMD
 Layer Control` _state machine behavior_ to the layer you want to control.

+You can also disable this behavior entirely by attaching the [VRChat Settings](../reference/vrchat-settings) component
+to your avatar and disabling the relevant setting.
+
 :::warning

 The `MA MMD Layer Control` state machine behavior will only work when attached to the layer directly. Due to how state
--- a/docs~/docs/reference/merge-blend-tree.md
+++ b/docs~/docs/reference/merge-blend-tree.md
@ -1,32 +1,48 @@
-# Merge Blend Tree
+# Merge Motion (Blend Tree)

 ![Merge Blend Tree](merge-blend-tree.png)

-The merge blend tree component allows you to merge multiple blend trees into a single FX layer.
+The merge motion component allows you to merge multiple blend trees into a single FX layer.
 This is an advanced component that allows for building lower-overhead animators by merging multiple gimmicks into a
 single layer.
+It can also be used to set an animation that is always running.
+
+:::info
+
+Prior to 1.12, this component was called "Merge Blend Tree". In 1.12 it was expanded to support merging animation clips
+as well; as such the name was changed to "Merge Motion". Existing assets created using 1.11 or earlier's Merge Blend Tree
+will automatically be upgraded to use the new Merge Motion component.
+
+For API compatibility purposes, this component is still internally called `ModularAvatarMergeBlendTree`.
+
+:::

 ## When should I use it?

-You should use Merge Blend Tree when you have a blend tree that you want to be always active on the avatar.
+You should use Merge Motion when you have a motion (animation clip or blend tree) that you want to be always active 
+n the avatar.

 ## When shouldn't I use it?

-You should not use Merge Blend Tree if you need to disable/enable the blend tree, or have control over motion time.
+You should not use Merge Motion if you need to disable/enable the Motion, or have control over motion time.

-## Setting up Merge Blend Tree
+## Merging a Blend Tree

 First, create a Blend Tree asset. You can do this by right clicking on the project window and selecting
 Create -> BlendTree.

-Configure your blend tree as desired, then add a Merge Blend Tree component and specify the Blend Tree in the Blend
-Tree field.
+Configure your blend tree as desired, then add a Merge Motion component and specify the Blend Tree in the Motion
+field.

 You can configure Path Mode and Relative Path Root similarly to Merge Animator; for more details, see the
 [Merge Animator documentation](merge-animator.md).

-## How blend trees are merged
+## Merging animations
+
+Simply put the animation in the "Motion (or Blend Tree) to merge" field. The animation will be constantly played.
+
+## How motions are merged

 Modular Avatar will create a new layer at the top of the FX controller. This layer will contain a single state, with
-Write Defaults on, and containing a Direct Blend Tree. Each merged blend tree will be attached to this Direct Blend
+Write Defaults on, and containing a Direct Blend Tree. Each merged motion will be attached to this Direct Blend
 Tree, with its parameter always set to one.
--- a/docs~/docs/reference/merge-blend-tree.png
+++ b/docs~/docs/reference/merge-blend-tree.png
--- a/docs~/docs/reference/vrchat-settings.md
+++ b/docs~/docs/reference/vrchat-settings.md
@ -0,0 +1,10 @@
+# VRChat Settings
+
+This component allows you to set certain avatar-wide configuration that applies specifically to VRChat.
+It can be placed anywhere on the avatar.
+
+Only one instance of this component can be present on the avatar at a time. If not found, default settings will be used.
+
+## Settings
+
+- **MMD World Support**: Enables special animator handling for MMD worlds. See the documentation on [MMD handling](../general-behavior/mmd) for details.
--- a/docs~/i18n/ja/docusaurus-plugin-content-docs/current/changelog.md
+++ b/docs~/i18n/ja/docusaurus-plugin-content-docs/current/changelog.md
@ -2,5 +2,5 @@
 sidebar_position: 9
 ---

-# リリースノーツ
+# リリースノート

--- a/docs~/i18n/ja/docusaurus-plugin-content-docs/current/general-behavior/mmd.md
+++ b/docs~/i18n/ja/docusaurus-plugin-content-docs/current/general-behavior/mmd.md
@ -10,6 +10,8 @@ Merge Animatorなどで追加されたレイヤーは、（置換モードでも
 必要に応じて、それらを保護するためのパディングレイヤーが追加されます。MMDワールドの動作で無効化したい場合は、
 `MA MMD Layer Control` という_ステートマシンビヘイビア_を制御したいレイヤーに追加することができます。

+また、全体的にこの対応を無効にする場合は、[VRChat Settings](../reference/vrchat-settings)コンポーネントをアバターにつけて、
+該当設置絵を無効にしてください。

 :::warning

--- a/docs~/i18n/ja/docusaurus-plugin-content-docs/current/reference/merge-blend-tree.md
+++ b/docs~/i18n/ja/docusaurus-plugin-content-docs/current/reference/merge-blend-tree.md
@ -1,19 +1,30 @@
-# Merge Blend Tree
+# Merge Motion (Blend Tree)

 ![Merge Blend Tree](merge-blend-tree.png)

 Merge Blend Treeは、複数のブレンドツリーを1つのFXレイヤーにマージすることができます。
 複数のギミックを1つのレイヤーにまとめて、負荷を低減するための高度なコンポーネントです。
+また、常に実行されるアニメーションを設定するためにも使用できます。
+
+:::info
+
+1.12以前では、このコンポーネントは「Merge Blend Tree」と呼ばれていました。1.12では、アニメーションクリップのマージにも
+対応するように拡張されたため、名前が「Merge Motion」に変更されました。1.11以前のMerge Blend Treeで作成された
+既存のアセットは、新しいMerge Motionコンポーネントを使用するように自動的にアップグレードされます。
+
+なお、APIでは、互換性のためこのコンポーネントは引き続き`ModularAvatarMergeBlendTree`と呼ばれています。
+
+:::

 ## いつ使うもの？

-ブレンドツリーを常にアバターで稼働させたい場合に使います。
+常に再生させるモーション（アニメーションクリップ、またはブレンドツリー）を設定したい場合に、Merge Motionを使用してください。

 ## いつ使わないもの？

-ブレンドツリーを無効にしたり、モーションタイムを制御したりする必要がある場合は、Merge Blend Treeを使わないでください。
+モーションを無効にしたり、モーションタイムを制御したりする必要がある場合は、Merge Motionを使わないでください。

-## セットアップ方法
+## ブレンドツリーでのセットアップ方法

 まず、ブレンドツリーのアセットを作成します。プロジェクトウィンドウで右クリックして、Create -> BlendTreeを選択してください。

@ -22,8 +33,12 @@ Merge Blend Treeは、複数のブレンドツリーを1つのFXレイヤーに
 パスモードと相対パスルートは、Merge Animatorと同様に設定できます。
 詳細は、[Merge Animatorのドキュメント](merge-animator.md)を参照してください。

-## ブレンドツリーのマージ方法
+## アニメーションのマージ
+
+アニメーションを「モーション（またはブレンドツリー）」フィールドに配置するだけです。アニメーションは常に再生されます。
+
+## マージ方法について

 Modular Avatarは、FXコントローラーの一番上に新しいレイヤーを作成します。
 このレイヤーには、Write Defaultsがオンになっている単一のステートが含まれています。
-マージされたブレンドツリーは、パラメーターが常に1に設定されているこのDirect Blend Treeに接続されます。
+マージされたモーションは、パラメーターが常に1に設定されているこのDirect Blend Treeに接続されます。
--- a/docs~/i18n/ja/docusaurus-plugin-content-docs/current/reference/merge-blend-tree.png
+++ b/docs~/i18n/ja/docusaurus-plugin-content-docs/current/reference/merge-blend-tree.png
--- a/docs~/i18n/ja/docusaurus-plugin-content-docs/current/reference/vrchat-settings.md
+++ b/docs~/i18n/ja/docusaurus-plugin-content-docs/current/reference/vrchat-settings.md
@ -0,0 +1,10 @@
+# VRChat Settings
+
+このコンポーネントを使用すると、VRChatに特有のアバター全体の設定を行うことができます。
+アバターのどこにでも配置できます。
+
+アバターには１個のみ存在できます。見つからない場合、デフォルトの設定が使用されます。
+
+## 設定
+
+- **MMD ワールド対応**: MMDワールド用の特別なアニメーター処理を有効にします。詳細は[MMD処理](../general-behavior/mmd)のドキュメントを参照してください。
--- a/docs~/yarn.lock
+++ b/docs~/yarn.lock
@ -7286,11 +7286,11 @@ __metadata:
  linkType: hard

 "estree-util-value-to-estree@npm:^3.0.1":
-  version: 3.1.2
-  resolution: "estree-util-value-to-estree@npm:3.1.2"
+  version: 3.3.3
+  resolution: "estree-util-value-to-estree@npm:3.3.3"
  dependencies:
    "@types/estree": ^1.0.0
-  checksum: 31c4b9f3a2e64119b994a86d70070325b6ec238a21842669e79b0d6a7190150293616c8f38fee1c369c18bbef405064d883aa38c05311db5d0a211a30e9924d6
+  checksum: 73851f26715300046228cf8a36986c101d6741d7a2b024f684675e75d1191bc07b0dc069926876729efd5650343d23bffe76104221b7dc862965632302b05524
  languageName: node
  linkType: hard

@ -8484,13 +8484,13 @@ __metadata:
  linkType: hard

 "image-size@npm:^1.0.2":
-  version: 1.1.1
-  resolution: "image-size@npm:1.1.1"
+  version: 1.2.1
+  resolution: "image-size@npm:1.2.1"
  dependencies:
    queue: 6.0.2
  bin:
    image-size: bin/image-size.js
-  checksum: 23b3a515dded89e7f967d52b885b430d6a5a903da954fce703130bfb6069d738d80e6588efd29acfaf5b6933424a56535aa7bf06867e4ebd0250c2ee51f19a4a
+  checksum: 8601ddd4edc1db16f097f5cf585c23214e29c3b8f4d8a8f8d59b8e3bae2338c8a5073236bfff421d8541091a98a38b802ed049203c745286a69d1aac4e5bc4c7
  languageName: node
  linkType: hard

--- a/package.json
+++ b/package.json
@ -1,7 +1,7 @@
 {
  "name": "nadena.dev.modular-avatar",
  "displayName": "Modular Avatar",
-  "version": "1.12.0-beta.0",
+  "version": "1.13.0-alpha.1",
  "unity": "2022.3",
  "description": "A suite of tools for assembling your avatar out of reusable components",
  "author": {
@ -16,6 +16,6 @@
  },
  "vpmDependencies": {
    "com.vrchat.avatars": ">=3.7.4",
-    "nadena.dev.ndmf": ">=1.7.0-beta.0 <2.0.0-a"
+    "nadena.dev.ndmf": ">=1.8.0-alpha.4 <2.0.0-a"
  }
 }
Author	SHA1	Message	Date
nadena.dev release bot	59c256704b	Release 1.13.0-alpha.1	2025-04-10 03:29:38 +00:00
bd_	c4f3728d5e	chore: update changelog for stable release	2025-04-09 20:24:51 -07:00
bd_	dcda15569a	fix: merge blend tree does not correct parameter type conflicts (#1552 )	2025-04-09 20:05:48 -07:00
bd_	8cba3560ce	fix: reactive object could generate inconsistent WD results (#1553 )	2025-04-09 20:00:40 -07:00
bd_	17051419ec	change: force blend tree-only layers to WD ON (#1551 ) Closes: #1545	2025-04-09 19:14:44 -07:00
dependabot[bot]	1a1cae4e04	chore(deps): bump actions/create-github-app-token in /.github/workflows (#1546 ) Bumps [actions/create-github-app-token](https://github.com/actions/create-github-app-token) from 1 to 2. - [Release notes](https://github.com/actions/create-github-app-token/releases) - [Commits](https://github.com/actions/create-github-app-token/compare/v1...v2) --- updated-dependencies: - dependency-name: actions/create-github-app-token dependency-version: '2' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2025-04-09 19:07:03 -07:00
dependabot[bot]	e5e4c41b38	chore(deps): bump estree-util-value-to-estree in /docs~ (#1548 ) Bumps [estree-util-value-to-estree](https://github.com/remcohaszing/estree-util-value-to-estree) from 3.1.2 to 3.3.3. - [Release notes](https://github.com/remcohaszing/estree-util-value-to-estree/releases) - [Commits](https://github.com/remcohaszing/estree-util-value-to-estree/compare/v3.1.2...v3.3.3) --- updated-dependencies: - dependency-name: estree-util-value-to-estree dependency-version: 3.3.3 dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2025-04-09 19:06:56 -07:00
nadena.dev release bot	c7c9e23acb	Release 1.13.0-alpha.0	2025-04-08 01:34:44 +00:00
bd_	5be1f13840	feat: platform support declarations (#1547 )	2025-04-07 18:29:26 -07:00
nadena.dev release bot	420f9b00b1	Release 1.12.3	2025-04-05 21:55:36 +00:00
bd_	45b5db46c5	chore(deps): update NDMF dependency	2025-04-05 14:50:19 -07:00
bd_	03ee9d6048	fix: incorrect WD matching handling for single-animation-clip layers (#1542 ) Evidently, unity has special handling specifically for single-state layers with a blend tree, but _not_ for single-state layers with an animation clip. Closes: #1541	2025-04-05 14:20:03 -07:00
dependabot[bot]	897d168137	chore(deps): bump image-size from 1.1.1 to 1.2.1 in /docs~ (#1535 ) Bumps [image-size](https://github.com/image-size/image-size) from 1.1.1 to 1.2.1. - [Release notes](https://github.com/image-size/image-size/releases) - [Commits](https://github.com/image-size/image-size/compare/v1.1.1...v1.2.1) --- updated-dependencies: - dependency-name: image-size dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2025-04-05 11:40:05 -07:00
nadena.dev release bot	400960257e	Release 1.12.2	2025-04-03 02:44:37 +00:00
bd_	f0fcbb66b1	fix: animated parameters in merge motion aren't renamed (#1537 ) * fix: animated parameters in merge motion aren't renamed Closes: #1536	2025-04-02 19:39:34 -07:00
nadena.dev release bot	7fd35bb49a	Release 1.12.1	2025-04-02 02:22:57 +00:00
bd_	bc4c6628ee	chore(deps): update NDMF dep	2025-04-01 19:16:16 -07:00
bd_	b733ce2e4d	fix: MA breaks in new VRCSDK projects (#1532 )	2025-04-01 19:01:37 -07:00
bd_	3324d3f71b	docs: fix CHANGELOG	2025-03-31 22:39:35 -07:00
nadena.dev release bot	c3d2cfb29f	Release 1.12.0	2025-04-01 05:10:29 +00:00
bd_	7610020c3b	chore(ci): fix typo	2025-03-31 22:05:48 -07:00
bd_	89de978c77	chore(ci): fix typo	2025-03-31 21:39:33 -07:00
bd_	db9389052c	chore(deps): update NDMF dependency	2025-03-31 18:53:19 -07:00
bd_	81aed5b798	fix: compatibility issue with lilycalInventory (#1531 ) The early animator cloning logic was dropped in refactoring, put it back.	2025-03-30 23:00:12 +00:00
bd_	706ce7aa2f	feat: use stable identifiers for MA Menu Items (#1530 )	2025-03-30 18:07:48 +00:00
nadena.dev release bot	b75e74ef84	Release 1.12.0-rc.1	2025-03-28 02:15:53 +00:00
bd_	8ef4cf6328	feat: MA Parameters auto-rename now uses stable names (#1529 ) Closes: #1527, #1430	2025-03-23 13:50:59 -07:00
nadena-dev-ci	c521bd7721	Update source file en-US.json (#1526 )	2025-03-23 19:22:08 +00:00
bd_	e46e958f39	fix: match WD = off setting is not respected (#1528 ) Closes: #1519	2025-03-23 18:34:19 +00:00
bd_	8a45515af0	chore(docs): update merge motion screenshots (#1525 ) Closes: #1517	2025-03-23 02:54:15 +00:00
bd_	36b442f904	feat: allow opt-out from MMD handling (#1524 ) Closes: #1518	2025-03-23 02:51:23 +00:00
bd_	124392c422	chore(docs): adjust docs translation (#1523 ) Closes: #1521	2025-03-23 02:46:40 +00:00
bd_	dff7f03c2f	fix: convert constraints fails to convert animations (#1522 ) Closes: #1520	2025-03-23 01:57:04 +00:00
nadena.dev release bot	713a0d3b1d	Release 1.12.0-rc.0	2025-03-22 04:43:16 +00:00
nadena-dev-ci	e2a02982d5	New Crowdin updates (#1516 ) * New translations en-us.json (Japanese) * New translations en-us.json (Korean) * New translations en-us.json (Chinese Simplified) * New translations en-us.json (Chinese Traditional) * Update source file en-US.json * New translations en-us.json (Japanese)	2025-03-21 21:38:09 -07:00
bd_	672dd8b31f	chore: update NDMF dependency	2025-03-21 21:34:28 -07:00
bd_	6175e20e46	fix: expressions menu icon compression breaks on iOS builds (#1513 )	2025-03-22 03:25:00 +00:00
bd_	fce938820b	fix: compiler warnings (#1515 )	2025-03-22 03:20:23 +00:00
bd_	34deac5681	feat: support merging animation clips in Merge Blend Tree (#1514 ) This renames Merge Blend Tree to Merge Motion, and expands it to support arbitrary motions. Closes: #1438	2025-03-22 03:10:45 +00:00
bd_	b49e5cb460	fix: non-divisible-by-four texture sizes breaks automatic expressions menu icon compression (#1508 ) Closes: #1477	2025-03-19 03:25:30 +00:00
bd_	3165d471b5	chore(changelog): fix header after release	2025-03-16 21:14:45 -07:00
bd_	2d59c74066	fix(ci): perform-release workflow doesn't update JP CHANGELOGs	2025-03-16 21:13:33 -07:00