From 5c7e7b06274bb8869fbbb036a9863c8d7f4f7195 Mon Sep 17 00:00:00 2001
From: ousttrue <ousttrue@gmail.com>
Date: Fri, 28 Dec 2018 14:47:19 +0900
Subject: [PATCH] Fixed build error #93

---
 Scripts/Format/VRMImporterContext.cs | 30 ++++++++++++++--------------
 UniGLTF                              |  2 +-
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/Scripts/Format/VRMImporterContext.cs b/Scripts/Format/VRMImporterContext.cs
index f84e28480..04b336208 100644
--- a/Scripts/Format/VRMImporterContext.cs
+++ b/Scripts/Format/VRMImporterContext.cs
@@ -17,20 +17,6 @@ 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();
@@ -332,7 +318,6 @@ namespace VRM
             return meta;
         }
 
-#if UNITY_EDITOR
         protected override IEnumerable<UnityEngine.Object> ObjectsForSubAsset()
         {
             foreach (var x in base.ObjectsForSubAsset())
@@ -355,6 +340,21 @@ namespace VRM
             yield return Meta;
         }
 
+#if UNITY_EDITOR
+        public override bool IsOverwrite(UnityEngine.Object o)
+        {
+            if (o is BlendShapeAvatar)
+            {
+                return false;
+            }
+            if (o is BlendShapeClip)
+            {
+                return false;
+            }
+
+            return base.IsOverwrite(o);
+        }
+
         protected override UnityPath GetAssetPath(UnityPath prefabPath, UnityEngine.Object o)
         {
             if (o is BlendShapeAvatar
diff --git a/UniGLTF b/UniGLTF
index 232818e03..690847a1a 160000
--- a/UniGLTF
+++ b/UniGLTF
@@ -1 +1 @@
-Subproject commit 232818e03cb9ee703dc5ced5aae82e95ceeef2ce
+Subproject commit 690847a1a5a0bd3df55187e1f1cb6f338c09225b