From ea796cd342d64b54bb86dce5a2baf23bf735900b Mon Sep 17 00:00:00 2001
From: ousttrue <ousttrue@gmail.com>
Date: Tue, 25 May 2021 14:25:08 +0900
Subject: [PATCH] fix GetPrefab

---
 .../Expression/ExpressionEditorBase.cs        | 29 +------------------
 .../Expression/VRM10ExpressionAvatarEditor.cs |  6 ++++
 2 files changed, 7 insertions(+), 28 deletions(-)

diff --git a/Assets/VRM10/Editor/Components/Expression/ExpressionEditorBase.cs b/Assets/VRM10/Editor/Components/Expression/ExpressionEditorBase.cs
index 766093048..ef66e85f9 100644
--- a/Assets/VRM10/Editor/Components/Expression/ExpressionEditorBase.cs
+++ b/Assets/VRM10/Editor/Components/Expression/ExpressionEditorBase.cs
@@ -83,34 +83,7 @@ namespace UniVRM10
             }
         }
 
-        protected virtual GameObject GetPrefab()
-        {
-            var assetPath = AssetDatabase.GetAssetPath(target);
-            if (string.IsNullOrEmpty(assetPath))
-            {
-                return null;
-            }
-
-            var mainObject = AssetDatabase.LoadMainAssetAtPath(assetPath);
-            if (mainObject != null)
-            {
-                //return mainObject;
-            }
-
-            var prefab = AssetDatabase.LoadAssetAtPath<GameObject>(assetPath);
-            if (prefab != null) return prefab;
-
-            var parent = UnityPath.FromUnityPath(assetPath).Parent;
-            var prefabPath = parent.Parent.Child(parent.FileNameWithoutExtension + ".prefab");
-            prefab = UnityEditor.AssetDatabase.LoadAssetAtPath<GameObject>(prefabPath.Value);
-            if (prefab != null) return prefab;
-
-            var parentParent = UnityPath.FromUnityPath(assetPath).Parent.Parent;
-            var vrmPath = parent.Parent.Child(parent.FileNameWithoutExtension + ".vrm");
-            prefab = UnityEditor.AssetDatabase.LoadAssetAtPath<GameObject>(vrmPath.Value);
-
-            return prefab;
-        }
+        protected abstract GameObject GetPrefab();
 
         protected virtual void OnEnable()
         {
diff --git a/Assets/VRM10/Editor/Components/Expression/VRM10ExpressionAvatarEditor.cs b/Assets/VRM10/Editor/Components/Expression/VRM10ExpressionAvatarEditor.cs
index 1788a64e7..6f9fadc1e 100644
--- a/Assets/VRM10/Editor/Components/Expression/VRM10ExpressionAvatarEditor.cs
+++ b/Assets/VRM10/Editor/Components/Expression/VRM10ExpressionAvatarEditor.cs
@@ -1,4 +1,5 @@
 using UnityEditor;
+using UnityEngine;
 
 namespace UniVRM10
 {
@@ -23,6 +24,11 @@ namespace UniVRM10
             }
         }
 
+        protected override GameObject GetPrefab()
+        {
+            return PrefabUtility.GetCorrespondingObjectFromSource(target as VRM10ExpressionAvatar)?.gameObject;
+        }
+
         /// <summary>
         /// 選択中の Expression のエディタ
         /// </summary>