From 7e91b1b4d52b219da187d0e23282b0b4f76d3543 Mon Sep 17 00:00:00 2001 From: ousttrue Date: Thu, 28 Nov 2024 13:30:25 +0900 Subject: [PATCH 1/2] =?UTF-8?q?gui=20=E3=81=AB=20checkbox=20=E3=81=A4?= =?UTF-8?q?=E3=81=91=E3=82=8F=E3=81=99=E3=82=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/VRM/Editor/Format/VRMExportOptions.cs | 4 ++++ Assets/VRM/Editor/Format/VRMExportSettingsEditor.cs | 1 + 2 files changed, 5 insertions(+) diff --git a/Assets/VRM/Editor/Format/VRMExportOptions.cs b/Assets/VRM/Editor/Format/VRMExportOptions.cs index 1b23da7bc..dfe78e7ea 100644 --- a/Assets/VRM/Editor/Format/VRMExportOptions.cs +++ b/Assets/VRM/Editor/Format/VRMExportOptions.cs @@ -12,6 +12,10 @@ namespace VRM [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/VRMExportSettingsEditor.cs b/Assets/VRM/Editor/Format/VRMExportSettingsEditor.cs index 9c8901ab3..3df60f240 100644 --- a/Assets/VRM/Editor/Format/VRMExportSettingsEditor.cs +++ b/Assets/VRM/Editor/Format/VRMExportSettingsEditor.cs @@ -48,6 +48,7 @@ namespace VRM 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)); From f155a15c7e1c762b3bd646bd2a4fb504dafda965 Mon Sep 17 00:00:00 2001 From: ousttrue Date: Thu, 28 Nov 2024 13:30:49 +0900 Subject: [PATCH 2/2] =?UTF-8?q?0.x=20=E3=81=AF=E3=80=80default=20true?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/VRM/Editor/Format/VRMExportSettings.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/VRM/Editor/Format/VRMExportSettings.cs b/Assets/VRM/Editor/Format/VRMExportSettings.cs index cc634263a..29b93d57e 100644 --- a/Assets/VRM/Editor/Format/VRMExportSettings.cs +++ b/Assets/VRM/Editor/Format/VRMExportSettings.cs @@ -23,7 +23,7 @@ namespace VRM /// FreezeBlendShape /// [Tooltip("when freeze mesh, blendShpae base use current weight")] - public bool FreezeMeshUseCurrentBlendShapeWeight = false; + public bool FreezeMeshUseCurrentBlendShapeWeight = true; /// /// BlendShapeのシリアライズにSparseAccessorを使う