From 2ff647ec57bb727576cde57f6e4ba5b76ed10cc4 Mon Sep 17 00:00:00 2001
From: ousttrue <ousttrue@gmail.com>
Date: Mon, 8 Mar 2021 12:59:25 +0900
Subject: [PATCH] =?UTF-8?q?EditorContext=20=E3=81=AF=E6=89=80=E6=9C=89?=
 =?UTF-8?q?=E3=81=97=E3=81=AA=E3=81=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Editor/UniGLTF/EditorImporterContext.cs     | 17 +----------------
 ...orGUI.cs => GlbScriptedImporterEditorGUI.cs} |  2 +-
 ...eta => GlbScriptedImporterEditorGUI.cs.meta} |  0
 Assets/VRM/Editor/Format/VRMImporterMenu.cs     |  2 +-
 .../VRM/Editor/Format/vrmAssetPostprocessor.cs  |  2 +-
 5 files changed, 4 insertions(+), 19 deletions(-)
 rename Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/{GltfScriptedImporterEditorGUI.cs => GlbScriptedImporterEditorGUI.cs} (98%)
 rename Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/{GltfScriptedImporterEditorGUI.cs.meta => GlbScriptedImporterEditorGUI.cs.meta} (100%)

diff --git a/Assets/UniGLTF/Editor/UniGLTF/EditorImporterContext.cs b/Assets/UniGLTF/Editor/UniGLTF/EditorImporterContext.cs
index 33197de02..c55c64840 100644
--- a/Assets/UniGLTF/Editor/UniGLTF/EditorImporterContext.cs
+++ b/Assets/UniGLTF/Editor/UniGLTF/EditorImporterContext.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -10,11 +9,8 @@ namespace UniGLTF
 {
     /// <summary>
     /// Editor で Asset 化する場合専用
-    /// 
-    /// GameObject を prefab 化するので、prefab の元になった GameObject は破棄対象となる。
-    /// 
     /// </summary>
-    public class EditorImporterContext : IDisposable
+    public class EditorImporterContext
     {
         ImporterContext m_context;
 
@@ -23,17 +19,6 @@ namespace UniGLTF
             m_context = context;
         }
 
-        public void Dispose()
-        {
-            m_context.Dispose();
-
-            if (m_context.Root != null)
-            {
-                // Destroy the GameObject that became the basis of Prefab
-                GameObject.DestroyImmediate(m_context.Root);
-            }
-        }
-
         public virtual IEnumerable<UnityEngine.Object> ObjectsForSubAsset()
         {
             foreach (var x in m_context.TextureFactory.ObjectsForSubAsset())
diff --git a/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/GltfScriptedImporterEditorGUI.cs b/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/GlbScriptedImporterEditorGUI.cs
similarity index 98%
rename from Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/GltfScriptedImporterEditorGUI.cs
rename to Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/GlbScriptedImporterEditorGUI.cs
index 65c800f4f..4a8ce8c41 100644
--- a/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/GltfScriptedImporterEditorGUI.cs
+++ b/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/GlbScriptedImporterEditorGUI.cs
@@ -8,7 +8,7 @@ using UnityEngine;
 namespace UniGLTF
 {
     [CustomEditor(typeof(GlbScriptedImporter))]
-    public class GltfScriptedImporterEditorGUI : ScriptedImporterEditor
+    public class GlbScriptedImporterEditorGUI : ScriptedImporterEditor
     {
         GlbScriptedImporter m_importer;
         GltfParser m_parser;
diff --git a/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/GltfScriptedImporterEditorGUI.cs.meta b/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/GlbScriptedImporterEditorGUI.cs.meta
similarity index 100%
rename from Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/GltfScriptedImporterEditorGUI.cs.meta
rename to Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/GlbScriptedImporterEditorGUI.cs.meta
diff --git a/Assets/VRM/Editor/Format/VRMImporterMenu.cs b/Assets/VRM/Editor/Format/VRMImporterMenu.cs
index ca5e8f7ed..798b5ec12 100644
--- a/Assets/VRM/Editor/Format/VRMImporterMenu.cs
+++ b/Assets/VRM/Editor/Format/VRMImporterMenu.cs
@@ -63,7 +63,7 @@ namespace VRM
                     //
                     context.Load();
                     editor.SaveAsAsset(prefabPath);
-                    editor.Dispose();
+                    context.Dispose();
                 };
             }
         }
diff --git a/Assets/VRM/Editor/Format/vrmAssetPostprocessor.cs b/Assets/VRM/Editor/Format/vrmAssetPostprocessor.cs
index d48480048..f8c95f061 100644
--- a/Assets/VRM/Editor/Format/vrmAssetPostprocessor.cs
+++ b/Assets/VRM/Editor/Format/vrmAssetPostprocessor.cs
@@ -70,7 +70,7 @@ namespace VRM
                 //
                 context.Load();
                 editor.SaveAsAsset(prefabPath);
-                editor.Dispose();
+                context.Dispose();
             };
         }
     }