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 1/3] 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>

From 3e16a2f492160ee79d730bdfc79cd4a9eb5cd92d Mon Sep 17 00:00:00 2001
From: ousttrue <ousttrue@gmail.com>
Date: Tue, 25 May 2021 14:55:35 +0900
Subject: [PATCH 2/3] =?UTF-8?q?LoadDivided=20=E3=81=AB=20BlendShape=20impo?=
 =?UTF-8?q?rt=20=E3=81=AE=E5=AE=9F=E8=A3=85=E3=81=8C=E7=84=A1=E3=81=8B?=
 =?UTF-8?q?=E3=81=A3=E3=81=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Runtime/IO/Model/MeshImporterDivided.cs   | 22 +++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/Assets/VRM10/Runtime/IO/Model/MeshImporterDivided.cs b/Assets/VRM10/Runtime/IO/Model/MeshImporterDivided.cs
index 56dcfba8b..64c646c71 100644
--- a/Assets/VRM10/Runtime/IO/Model/MeshImporterDivided.cs
+++ b/Assets/VRM10/Runtime/IO/Model/MeshImporterDivided.cs
@@ -45,9 +45,8 @@ namespace UniVRM10
                         });
                     }
                 }
-
-                // TODO: BlendShape
             }
+
             dst.name = src.Name;
             dst.vertices = positions.ToArray();
             dst.normals = normals.ToArray();
@@ -80,6 +79,25 @@ namespace UniVRM10
 
             dst.RecalculateBounds();
             dst.RecalculateTangents();
+
+            //
+            // blendshape
+            //
+            var blendShapeCount = src.Meshes[0].MorphTargets.Count;
+            for (int i = 0; i < blendShapeCount; ++i)
+            {
+                positions.Clear();
+                normals.Clear();
+                var name = src.Meshes[0].MorphTargets[i].Name;
+                for (int meshIndex = 0; meshIndex < src.Meshes.Count; ++meshIndex)
+                {
+                    var morphTarget = src.Meshes[meshIndex].MorphTargets[i];
+                    positions.AddRange(morphTarget.VertexBuffer.Positions.GetSpan<Vector3>());
+                    normals.AddRange(morphTarget.VertexBuffer.Normals.GetSpan<Vector3>());
+                }
+                dst.AddBlendShapeFrame(name, 100.0f, positions.ToArray(), normals.ToArray(), null);
+            }
+
             return dst;
         }
     }

From e40fd2296a603cc2e7a25cd20af13d2355075b4b Mon Sep 17 00:00:00 2001
From: ousttrue <ousttrue@gmail.com>
Date: Tue, 25 May 2021 16:03:36 +0900
Subject: [PATCH 3/3] =?UTF-8?q?preview=20scene=20=E3=81=AE=E7=A0=B4?=
 =?UTF-8?q?=E6=A3=84=E3=82=BF=E3=82=A4=E3=83=9F=E3=83=B3=E3=82=B0=E3=82=92?=
 =?UTF-8?q?=E5=A4=89=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Editor/Components/Expression/ExpressionEditorBase.cs      | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/Assets/VRM10/Editor/Components/Expression/ExpressionEditorBase.cs b/Assets/VRM10/Editor/Components/Expression/ExpressionEditorBase.cs
index ef66e85f9..ddb4ab1ad 100644
--- a/Assets/VRM10/Editor/Components/Expression/ExpressionEditorBase.cs
+++ b/Assets/VRM10/Editor/Components/Expression/ExpressionEditorBase.cs
@@ -99,10 +99,6 @@ namespace UniVRM10
                 m_renderer.Dispose();
                 m_renderer = null;
             }
-        }
-
-        protected virtual void OnDestroy()
-        {
             if (m_scene != null)
             {
                 //Debug.LogFormat("OnDestroy");