diff --git a/Assets/VRM10/Editor/Components/Expression/ExpressionSelector.cs b/Assets/VRM10/Editor/Components/Expression/ExpressionSelector.cs index 3de3fdffb..446331e47 100644 --- a/Assets/VRM10/Editor/Components/Expression/ExpressionSelector.cs +++ b/Assets/VRM10/Editor/Components/Expression/ExpressionSelector.cs @@ -74,26 +74,34 @@ namespace UniVRM10 }; } - public void GUI() + public void DrawGUI() { - EditorGUILayout.Space(); - EditorGUILayout.LabelField("Select Expression", EditorStyles.boldLabel); - - m_mode = GUILayout.Toolbar(m_mode, MODES); - switch (m_mode) + var backup = GUI.enabled; + try { - case 0: - SelectGUI(); - break; + GUI.enabled = true; + EditorGUILayout.Space(); + EditorGUILayout.LabelField("Select Expression", EditorStyles.boldLabel); - case 1: - m_clipList.GUI(); - break; + m_mode = GUILayout.Toolbar(m_mode, MODES); + switch (m_mode) + { + case 0: + SelectGUI(); + break; - default: - throw new NotImplementedException(); + case 1: + m_clipList.GUI(); + break; + + default: + throw new NotImplementedException(); + } + } + finally + { + GUI.enabled = backup; } - } void SelectGUI() diff --git a/Assets/VRM10/Editor/Components/Expression/SerializedExpressionEditor.cs b/Assets/VRM10/Editor/Components/Expression/SerializedExpressionEditor.cs index e5956b65f..fc454c558 100644 --- a/Assets/VRM10/Editor/Components/Expression/SerializedExpressionEditor.cs +++ b/Assets/VRM10/Editor/Components/Expression/SerializedExpressionEditor.cs @@ -181,7 +181,7 @@ namespace UniVRM10 return m_changed; } - List m_meshFolds = new List(); + static List m_meshFolds = new List(); bool MorphTargetBindsGUI() { bool changed = false; diff --git a/Assets/VRM10/Editor/Components/Expression/VRM10ExpressionAvatarEditor.cs b/Assets/VRM10/Editor/Components/Expression/VRM10ExpressionAvatarEditor.cs index 96633587b..1788a64e7 100644 --- a/Assets/VRM10/Editor/Components/Expression/VRM10ExpressionAvatarEditor.cs +++ b/Assets/VRM10/Editor/Components/Expression/VRM10ExpressionAvatarEditor.cs @@ -64,7 +64,7 @@ namespace UniVRM10 base.OnInspectorGUI(); // selector - Selector.GUI(); + Selector.DrawGUI(); // editor if (m_serializedEditor != null)