Merge pull request #1118 from ousttrue/fix10/fix_expression_editor

[VRM10] VRM10Expression のカスタムエディターの修正
vrm-c · Aug 3, 2021 · 8d193fd · 8d193fd
2 parents 2aa0f86 + 819fb95
commit 8d193fd
Show file tree

Hide file tree

Showing 9 changed files with 251 additions and 571 deletions.
diff --git a/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/RemapEditorBase.cs b/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/RemapEditorBase.cs
@@ -81,7 +81,7 @@ protected bool CanExtract(ScriptedImporter importer)
             {
                 foreach (var key in m_keys)
                 {
-                    if (k.type.IsAssignableFrom(key.Type))
+                    if (k.type != null && k.type.IsAssignableFrom(key.Type))
                     {
                         return false;
                     }

diff --git a/Assets/VRM10/Editor/Components/Expression/ExpressionEditorBase.cs b/Assets/VRM10/Editor/Components/Expression/ExpressionEditorBase.cs
diff --git a/Assets/VRM10/Editor/Components/Expression/ExpressionEditorBase.cs.meta b/Assets/VRM10/Editor/Components/Expression/ExpressionEditorBase.cs.meta