From e43ce3e9190960c0a5070ba80c8ebd1b6fb69bb8 Mon Sep 17 00:00:00 2001
From: ousttrue <ousttrue@gmail.com>
Date: Thu, 27 Dec 2018 15:18:00 +0900
Subject: [PATCH] Avoid BlendShape and Material overwrite. #56

---
 Scripts/Format/VRMImporterContext.cs | 14 ++++++++++++++
 UniGLTF                              |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/Scripts/Format/VRMImporterContext.cs b/Scripts/Format/VRMImporterContext.cs
index e73bcb11f..f84e28480 100644
--- a/Scripts/Format/VRMImporterContext.cs
+++ b/Scripts/Format/VRMImporterContext.cs
@@ -17,6 +17,20 @@ namespace VRM
         {
         }
 
+        public override bool IsOverwrite(UnityEngine.Object o)
+        {
+            if(o is BlendShapeAvatar)
+            {
+                return false;
+            }
+            if(o is BlendShapeClip)
+            {
+                return false;
+            }
+
+            return base.IsOverwrite(o);
+        }
+
         public override void Parse(string path, byte[] bytes)
         {
             var ext = Path.GetExtension(path).ToLower();
diff --git a/UniGLTF b/UniGLTF
index 415719191..a59f6438e 160000
--- a/UniGLTF
+++ b/UniGLTF
@@ -1 +1 @@
-Subproject commit 415719191b542a949929ae8b431ae83062559b35
+Subproject commit a59f6438ec560c356a9bbb1517d95877e85927f4