Merge pull request #2512 from ousttrue/fix/0x_freeze_blendshape_default

[0.x][export] 正規化時にBlendShapeをベイクするチェックボックスが無かった
vrm-c · Nov 28, 2024 · 69c5405 · 69c5405
2 parents a2cef97 + f155a15
commit 69c5405
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/Assets/VRM/Editor/Format/VRMExportOptions.cs b/Assets/VRM/Editor/Format/VRMExportOptions.cs
@@ -12,6 +12,10 @@ public enum VRMExportOptions
         [LangMsg(Languages.en, "Model's normalization (bake to remove roation and scaling from the hierarchy)")]
         NORMALIZE,
 
+        [LangMsg(Languages.ja, "正規化するときににブレンドシェイプによる変形をベイク処理します。")]
+        [LangMsg(Languages.en, "Bake the blendshape deformations as the base model when normalizing.")]
+        FREEZE_BLENDSHAPE,
+
         [LangMsg(Languages.ja, "エクスポート時に新しいJsonSerializerを使う")]
         [LangMsg(Languages.en, "The new version of JsonSerializer for model export")]
         USE_GENERATED_SERIALIZER,

diff --git a/Assets/VRM/Editor/Format/VRMExportSettings.cs b/Assets/VRM/Editor/Format/VRMExportSettings.cs
@@ -23,7 +23,7 @@ public class VRMExportSettings : ScriptableObject
         /// FreezeBlendShape
         /// </summary>
         [Tooltip("when freeze mesh, blendShpae base use current weight")]
-        public bool FreezeMeshUseCurrentBlendShapeWeight = false;
+        public bool FreezeMeshUseCurrentBlendShapeWeight = true;
 
         /// <summary>
         /// BlendShapeのシリアライズにSparseAccessorを使う

diff --git a/Assets/VRM/Editor/Format/VRMExportSettingsEditor.cs b/Assets/VRM/Editor/Format/VRMExportSettingsEditor.cs
@@ -48,6 +48,7 @@ static string Msg(VRMExportOptions key)
         private void OnEnable()
         {
             m_checkbox_list.Add(new CheckBoxProp(serializedObject.FindProperty(nameof(VRMExportSettings.PoseFreeze)), VRMExportOptions.NORMALIZE));
+            m_checkbox_list.Add(new CheckBoxProp(serializedObject.FindProperty(nameof(VRMExportSettings.FreezeMeshUseCurrentBlendShapeWeight)), VRMExportOptions.FREEZE_BLENDSHAPE));
             m_checkbox_list.Add(new CheckBoxProp(serializedObject.FindProperty(nameof(VRMExportSettings.UseSparseAccessor)), VRMExportOptions.BLENDSHAPE_USE_SPARSE));
             m_checkbox_list.Add(new CheckBoxProp(serializedObject.FindProperty(nameof(VRMExportSettings.OnlyBlendshapePosition)), VRMExportOptions.BLENDSHAPE_EXCLUDE_NORMAL_AND_TANGENT));
             m_checkbox_list.Add(new CheckBoxProp(serializedObject.FindProperty(nameof(VRMExportSettings.ReduceBlendshape)), VRMExportOptions.BLENDSHAPE_ONLY_CLIP_USE));