From 8b4bae8141da61807f7085583633606c6db4d16d Mon Sep 17 00:00:00 2001
From: ousttrue <ousttrue@gmail.com>
Date: Mon, 15 Jun 2020 16:58:43 +0900
Subject: [PATCH] #245

---
 Assets/VRM/UniGLTF/Scripts/IO/TextureExportManager.cs |  8 ++++++++
 Assets/VRM/UniGLTF/Scripts/IO/TextureIO.cs            | 10 +++++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/Assets/VRM/UniGLTF/Scripts/IO/TextureExportManager.cs b/Assets/VRM/UniGLTF/Scripts/IO/TextureExportManager.cs
index 2137af572..6a1baad95 100644
--- a/Assets/VRM/UniGLTF/Scripts/IO/TextureExportManager.cs
+++ b/Assets/VRM/UniGLTF/Scripts/IO/TextureExportManager.cs
@@ -57,6 +57,14 @@ namespace UniGLTF
                 return -1;
             }
 
+#if UNITY_EDITOR
+            if (!string.IsNullOrEmpty(UnityEditor.AssetDatabase.GetAssetPath(texture)))
+            {
+                m_exportTextures[index] = texture;
+                return index;
+            }
+#endif
+
             // ToDo: may already exists
             m_exportTextures[index] = TextureItem.CopyTexture(texture, readWrite, null);
 
diff --git a/Assets/VRM/UniGLTF/Scripts/IO/TextureIO.cs b/Assets/VRM/UniGLTF/Scripts/IO/TextureIO.cs
index 8ed768b32..0486c8f18 100644
--- a/Assets/VRM/UniGLTF/Scripts/IO/TextureIO.cs
+++ b/Assets/VRM/UniGLTF/Scripts/IO/TextureIO.cs
@@ -129,7 +129,15 @@ namespace UniGLTF
                         Bytes = System.IO.File.ReadAllBytes(path.FullPath),
                         Mime = "image/png",
                     };
-                }                    
+                }
+                if (path.Extension == ".jpg")
+                {
+                    return new BytesWithMime
+                    {
+                        Bytes = System.IO.File.ReadAllBytes(path.FullPath),
+                        Mime = "image/jpeg",
+                    };
+                }
             }
 #endif