From e98e0621306437260da0c2d2455c6ca5b5a8e18d Mon Sep 17 00:00:00 2001 From: ousttrue Date: Tue, 15 Feb 2022 19:04:07 +0900 Subject: [PATCH] dispose --- .../ScriptedImporter/GlbScriptedImporterEditor.cs | 12 ++++++++++++ .../ScriptedImporter/GltfScriptedImporterEditor.cs | 12 ++++++++++++ 2 files changed, 24 insertions(+) diff --git a/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/GlbScriptedImporterEditor.cs b/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/GlbScriptedImporterEditor.cs index f08dce012..d10352f22 100644 --- a/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/GlbScriptedImporterEditor.cs +++ b/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/GlbScriptedImporterEditor.cs @@ -26,6 +26,10 @@ namespace UniGLTF base.OnEnable(); m_importer = target as GlbScriptedImporter; + if (m_data != null) + { + m_data.Dispose(); + } m_data = new GlbFileParser(m_importer.assetPath).Parse(); var materialGenerator = new GltfMaterialDescriptorGenerator(); @@ -35,6 +39,14 @@ namespace UniGLTF m_animationEditor = new RemapEditorAnimation(AnimationImporterUtil.EnumerateSubAssetKeys(m_data.GLTF), GetEditorMap, SetEditorMap); } + public override void OnDisable() + { + m_data.Dispose(); + m_data = null; + + base.OnDisable(); + } + enum Tabs { Model, diff --git a/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/GltfScriptedImporterEditor.cs b/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/GltfScriptedImporterEditor.cs index 226fa1851..77efc711d 100644 --- a/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/GltfScriptedImporterEditor.cs +++ b/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/GltfScriptedImporterEditor.cs @@ -24,6 +24,10 @@ namespace UniGLTF base.OnEnable(); m_importer = target as GltfScriptedImporter; + if (m_data != null) + { + m_data.Dispose(); + } m_data = new AutoGltfFileParser(m_importer.assetPath).Parse(); var materialGenerator = new GltfMaterialDescriptorGenerator(); @@ -33,6 +37,14 @@ namespace UniGLTF m_animationEditor = new RemapEditorAnimation(AnimationImporterUtil.EnumerateSubAssetKeys(m_data.GLTF), GetEditorMap, SetEditorMap); } + public override void OnDisable() + { + m_data.Dispose(); + m_data = null; + + base.OnDisable(); + } + enum Tabs { Model,