From 502895c56e8d56d700a7ac289702520bea26724f Mon Sep 17 00:00:00 2001
From: ousttrue <ousttrue@gmail.com>
Date: Tue, 25 May 2021 19:30:50 +0900
Subject: [PATCH] ClearScene

---
 .../Components/Expression/ExpressionEditorBase.cs     | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/Assets/VRM10/Editor/Components/Expression/ExpressionEditorBase.cs b/Assets/VRM10/Editor/Components/Expression/ExpressionEditorBase.cs
index ddb4ab1ad..968c0bfdf 100644
--- a/Assets/VRM10/Editor/Components/Expression/ExpressionEditorBase.cs
+++ b/Assets/VRM10/Editor/Components/Expression/ExpressionEditorBase.cs
@@ -99,6 +99,17 @@ namespace UniVRM10
                 m_renderer.Dispose();
                 m_renderer = null;
             }
+            ClearScene();
+        }
+
+        protected virtual void OnDestroy()
+        {
+            // 2018/2019 で OnDisable/OnDestroy の呼ばれ方が違う？
+            ClearScene();
+        }
+
+        void ClearScene()
+        {
             if (m_scene != null)
             {
                 //Debug.LogFormat("OnDestroy");