diff --git a/CHANGELOG-PRERELEASE-jp.md b/CHANGELOG-PRERELEASE-jp.md index 0613ccb7..d1079eb7 100644 --- a/CHANGELOG-PRERELEASE-jp.md +++ b/CHANGELOG-PRERELEASE-jp.md @@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Fixed - [#1508] テクスチャのサイズが4の倍数でない場合に、エクスプレッションメニューアイコンの自動圧縮が失敗する問題を修正 +- [#1513] iOSビルドでエクスプレッションメニューアイコンの圧縮が壊れる問題を修正 ### Changed - [#1514] `Merge Blend Tree` は `Merge Motion (Blend Tree)` に改名され、アニメーションクリップにも対応するようになりました diff --git a/CHANGELOG-PRERELEASE.md b/CHANGELOG-PRERELEASE.md index 40f0e251..67136fd1 100644 --- a/CHANGELOG-PRERELEASE.md +++ b/CHANGELOG-PRERELEASE.md @@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### 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 diff --git a/CHANGELOG-jp.md b/CHANGELOG-jp.md index 50bb93d5..b4325071 100644 --- a/CHANGELOG-jp.md +++ b/CHANGELOG-jp.md @@ -23,6 +23,7 @@ Modular Avatarの主な変更点をこのファイルで記録しています。 - [#1504] 一部の状況で内部の`DelayDisable`レイヤーが不要なオブジェクトを参照しないように変更 - これにより、オブジェクトがアニメーションされているかどうかを追跡するAAOなどのツールとの互換性が向上します - [#1508] テクスチャのサイズが4の倍数でない場合に、エクスプレッションメニューアイコンの自動圧縮が失敗する問題を修正 +- [#1513] iOSビルドでエクスプレッションメニューアイコンの圧縮処理が壊れる問題を修正 ### Changed - [#1514] `Merge Blend Tree` は `Merge Motion (Blend Tree)` に改名され、アニメーションクリップにも対応するようになりました diff --git a/CHANGELOG.md b/CHANGELOG.md index 8be6f65d..8798635b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -27,6 +27,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - 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 - [#1514] `Merge Blend Tree` is now `Merge Motion (Blend Tree)` and supports merging animation clips as well as blend trees diff --git a/Editor/FixupPasses/FixupExpressionsMenuPass.cs b/Editor/FixupPasses/FixupExpressionsMenuPass.cs index 48f42ef6..491db0c5 100644 --- a/Editor/FixupPasses/FixupExpressionsMenuPass.cs +++ b/Editor/FixupPasses/FixupExpressionsMenuPass.cs @@ -119,11 +119,20 @@ namespace nadena.dev.modular_avatar.core.editor } } -#if UNITY_ANDROID - internal const TextureFormat TargetFormat = TextureFormat.ASTC_4x4; -#else - internal 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) {