From ad111243295a1a241e5dd16fafdf4c3de600c780 Mon Sep 17 00:00:00 2001
From: Fuji Sunflower <hazcyqund84@yahoo.co.jp>
Date: Sat, 28 Oct 2023 20:12:52 +0900
Subject: [PATCH 1/4] Fix null exception

Fix null exception by Humanoid
---
 .../VRM10/Runtime/Components/Vrm10Instance/Vrm10Instance.cs  | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Assets/VRM10/Runtime/Components/Vrm10Instance/Vrm10Instance.cs b/Assets/VRM10/Runtime/Components/Vrm10Instance/Vrm10Instance.cs
index a48ef5733..c871b2650 100644
--- a/Assets/VRM10/Runtime/Components/Vrm10Instance/Vrm10Instance.cs
+++ b/Assets/VRM10/Runtime/Components/Vrm10Instance/Vrm10Instance.cs
@@ -156,6 +156,11 @@ namespace UniVRM10
 
         public bool TryGetBoneTransform(HumanBodyBones bone, out Transform t)
         {
+            if (Humanoid == null)
+            {
+                t = null;
+                return false;
+            }
             t = Humanoid.GetBoneTransform(bone);
             if (t == null)
             {

From 407d6372f488a29f3262052271654a18d8dc3c45 Mon Sep 17 00:00:00 2001
From: Fuji Sunflower <hazcyqund84@yahoo.co.jp>
Date: Sat, 28 Oct 2023 20:27:01 +0900
Subject: [PATCH 2/4] Change to VerticalScope

Change to VerticalScope
---
 .../UniGLTF/ExportDialog/ExportDialogBase.cs  | 39 +++++++++----------
 1 file changed, 19 insertions(+), 20 deletions(-)

diff --git a/Assets/UniGLTF/Editor/UniGLTF/ExportDialog/ExportDialogBase.cs b/Assets/UniGLTF/Editor/UniGLTF/ExportDialog/ExportDialogBase.cs
index 7564ea58a..eb67943ea 100644
--- a/Assets/UniGLTF/Editor/UniGLTF/ExportDialog/ExportDialogBase.cs
+++ b/Assets/UniGLTF/Editor/UniGLTF/ExportDialog/ExportDialogBase.cs
@@ -144,33 +144,32 @@ namespace UniGLTF
             //
             // Create and Other Buttons
             {
-                // errors            
-                GUILayout.BeginVertical();
-                // GUILayout.FlexibleSpace();
-
+                // errors
+                using (new GUILayout.VerticalScope())
                 {
-                    GUILayout.BeginHorizontal();
-                    GUILayout.FlexibleSpace();
-                    GUI.enabled = State.Validations.All(x => x.CanExport);
-
-                    if (GUILayout.Button("Export", GUILayout.MinWidth(100)))
+                    // GUILayout.FlexibleSpace();
                     {
-                        var path = SaveFileDialog.GetPath(SaveTitle, SaveName, SaveExtensions);
-                        if (!string.IsNullOrEmpty(path))
+                        using (new GUILayout.HorizontalScope())
                         {
-                            ExportPath(path);
-                            // close
-                            Close();
-                            GUIUtility.ExitGUI();
+                            GUILayout.FlexibleSpace();
+                            GUI.enabled = State.Validations.All(x => x.CanExport);
+
+                            if (GUILayout.Button("Export", GUILayout.MinWidth(100)))
+                            {
+                                var path = SaveFileDialog.GetPath(SaveTitle, SaveName, SaveExtensions);
+                                if (!string.IsNullOrEmpty(path))
+                                {
+                                    ExportPath(path);
+                                    // close
+                                    Close();
+                                    GUIUtility.ExitGUI();
+                                }
+                            }
+                            GUI.enabled = true;
                         }
                     }
-                    GUI.enabled = true;
-
-                    GUILayout.EndHorizontal();
                 }
-                GUILayout.EndVertical();
             }
-
             GUILayout.Space(8);
         }
 

From e479edcec0ba8828dd9c5ae2b4abe0bc9539cc53 Mon Sep 17 00:00:00 2001
From: Fuji Sunflower <hazcyqund84@yahoo.co.jp>
Date: Sat, 28 Oct 2023 20:37:06 +0900
Subject: [PATCH 3/4] Change simple code

Change simple GUI code
---
 Assets/VRM10/Editor/Vrm10ExportDialog.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Assets/VRM10/Editor/Vrm10ExportDialog.cs b/Assets/VRM10/Editor/Vrm10ExportDialog.cs
index e67e7545f..937bd6f6f 100644
--- a/Assets/VRM10/Editor/Vrm10ExportDialog.cs
+++ b/Assets/VRM10/Editor/Vrm10ExportDialog.cs
@@ -15,8 +15,7 @@ namespace UniVRM10
     {
         public static void Open()
         {
-            var window = (VRM10ExportDialog)GetWindow(typeof(VRM10ExportDialog));
-            window.titleContent = new GUIContent("VRM-1.0 Exporter");
+            var window = GetWindow<VRM10ExportDialog>("VRM-1.0 Exporter");
             window.Show();
         }
 
@@ -203,7 +202,7 @@ namespace UniVRM10
                         }
                     }
                 }
-
+                EditorGUILayout.Separator();
                 GUI.enabled = backup;
             }
 
@@ -302,7 +301,8 @@ namespace UniVRM10
             {
                 m_logLabel += ex.ToString();
                 // rethrow
-                throw;
+                //throw;
+                Debug.LogException(ex);
             }
         }
     }

From 48708b82c45d49c1889dc64ea12373dd86ac8f91 Mon Sep 17 00:00:00 2001
From: Fuji Sunflower <hazcyqund84@yahoo.co.jp>
Date: Sat, 28 Oct 2023 20:40:36 +0900
Subject: [PATCH 4/4] Fix switch-case

Fix switch-case
---
 Assets/VRM10/Editor/Vrm10InstanceEditor.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Assets/VRM10/Editor/Vrm10InstanceEditor.cs b/Assets/VRM10/Editor/Vrm10InstanceEditor.cs
index a2778556b..ecf03c1ab 100644
--- a/Assets/VRM10/Editor/Vrm10InstanceEditor.cs
+++ b/Assets/VRM10/Editor/Vrm10InstanceEditor.cs
@@ -51,6 +51,7 @@ namespace UniVRM10
                     case ExpressionPreset.lookLeft: asset.Expression.LookLeft = kv.Value; break;
                     case ExpressionPreset.lookRight: asset.Expression.LookRight = kv.Value; break;
                     case ExpressionPreset.neutral: asset.Expression.Neutral = kv.Value; break;
+                    default: break;
                 }
             }