From ff13a46449e761d8ea5e857ade39090b41929d49 Mon Sep 17 00:00:00 2001 From: f-maeda Date: Wed, 5 Aug 2020 11:58:56 +0900 Subject: [PATCH] =?UTF-8?q?=E3=83=97=E3=83=AA=E3=82=BB=E3=83=83=E3=83=88?= =?UTF-8?q?=E5=90=8D=E3=81=8C=20Unknown=20=E4=BB=A5=E5=A4=96=E3=81=A7=20Bl?= =?UTF-8?q?endShape=20=E5=90=8D=E3=81=8C=E5=AD=98=E5=9C=A8=E3=81=99?= =?UTF-8?q?=E3=82=8B=E5=A0=B4=E5=90=88=E3=81=AE=E8=80=83=E6=85=AE=E3=81=8C?= =?UTF-8?q?=E6=8A=9C=E3=81=91=E3=81=A6=E3=81=84=E3=81=9F=E3=81=9F=E3=82=81?= =?UTF-8?q?=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../VRM/UniVRM/Scripts/BlendShape/BlendShapeKey.cs | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/Assets/VRM/UniVRM/Scripts/BlendShape/BlendShapeKey.cs b/Assets/VRM/UniVRM/Scripts/BlendShape/BlendShapeKey.cs index 89f715c5d..eb1a49c5e 100644 --- a/Assets/VRM/UniVRM/Scripts/BlendShape/BlendShapeKey.cs +++ b/Assets/VRM/UniVRM/Scripts/BlendShape/BlendShapeKey.cs @@ -49,17 +49,21 @@ namespace VRM { if (PresetNameCacheDictionary.TryGetValue(Preset, out var presetName)) { - m_id = Name = presetName; + m_id = presetName; } else { - m_id = Name = Preset.ToString(); - PresetNameCacheDictionary.Add(Preset, Name); + presetName = Preset.ToString(); + m_id = presetName; + + PresetNameCacheDictionary.Add(Preset, presetName); } + + Name = !string.IsNullOrEmpty(name) ? name : presetName; } else { - Name = name; + Name = !string.IsNullOrEmpty(name) ? name : ""; m_id = UnknownPresetPrefix + Name; } }