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; } }