From 1a1b876108c01b41cdf7029a763735cfa326beb9 Mon Sep 17 00:00:00 2001
From: Masataka SUMI <santarh@gmail.com>
Date: Fri, 29 Sep 2023 17:49:08 +0900
Subject: [PATCH] VRM10ExpressionEditorTool can control custom expressions.

---
 .../Editor/EditorTool/VRM10ExpressionEditorTool.cs    | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/Assets/VRM10/Editor/EditorTool/VRM10ExpressionEditorTool.cs b/Assets/VRM10/Editor/EditorTool/VRM10ExpressionEditorTool.cs
index ad15a88fe..296cad655 100644
--- a/Assets/VRM10/Editor/EditorTool/VRM10ExpressionEditorTool.cs
+++ b/Assets/VRM10/Editor/EditorTool/VRM10ExpressionEditorTool.cs
@@ -89,11 +89,8 @@ namespace UniVRM10
                     foreach (var kv in runtime.GetWeights())
                     {
                         var key = kv.Key;
-                        if (kv.Key.Preset != ExpressionPreset.custom)
-                        {
-                            var value = ExpressionPresetSlider(expression, kv.Key.Preset, kv.Value);
-                            m_map[key] = value;
-                        }
+                        var value = ExpressionSlider(key, kv.Value);
+                        m_map[key] = value;
                     }
                     GUILayout.FlexibleSpace();
 
@@ -118,10 +115,10 @@ namespace UniVRM10
             }
         }
 
-        float ExpressionPresetSlider(VRM10ObjectExpression expression, ExpressionPreset preset, float value)
+        float ExpressionSlider(ExpressionKey key, float value)
         {
             EditorGUILayout.BeginHorizontal(Style);
-            EditorGUILayout.LabelField(preset.ToString());
+            EditorGUILayout.LabelField(key.ToString());
             value = EditorGUILayout.Slider(value, 0, 1.0f);
             EditorGUILayout.EndHorizontal();
             return value;