From 57ab3f5420ea1243b434667bac3f8b2f97df113f Mon Sep 17 00:00:00 2001 From: f-maeda Date: Thu, 6 Aug 2020 11:08:30 +0900 Subject: [PATCH] =?UTF-8?q?BlendShapePreset.Unknown=20=E4=BB=A5=E5=A4=96?= =?UTF-8?q?=E3=81=AE=E5=A0=B4=E5=90=88=E3=80=81=E5=A4=96=E9=83=A8=E3=81=8B?= =?UTF-8?q?=E3=82=89=E6=B8=A1=E3=81=95=E3=82=8C=E3=81=9F=20string=20?= =?UTF-8?q?=E3=81=AE=20name=20=E3=81=AF=E6=8D=A8=E3=81=A6=E3=82=89?= =?UTF-8?q?=E3=82=8C=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/VRM/UniVRM/Scripts/BlendShape/BlendShapeKey.cs | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/Assets/VRM/UniVRM/Scripts/BlendShape/BlendShapeKey.cs b/Assets/VRM/UniVRM/Scripts/BlendShape/BlendShapeKey.cs index eb1a49c5e..fa19b13e5 100644 --- a/Assets/VRM/UniVRM/Scripts/BlendShape/BlendShapeKey.cs +++ b/Assets/VRM/UniVRM/Scripts/BlendShape/BlendShapeKey.cs @@ -49,17 +49,15 @@ namespace VRM { if (PresetNameCacheDictionary.TryGetValue(Preset, out var presetName)) { - m_id = presetName; + m_id = Name = presetName; } else { - presetName = Preset.ToString(); - m_id = presetName; + // BlendShapePreset.Unknown 以外の場合、 name は捨てられる + m_id = Name = Preset.ToString(); - PresetNameCacheDictionary.Add(Preset, presetName); + PresetNameCacheDictionary.Add(Preset, Name); } - - Name = !string.IsNullOrEmpty(name) ? name : presetName; } else {