From ef7252fe4d1721f4c2ae35a30cf5532327f4f186 Mon Sep 17 00:00:00 2001 From: ousttrue Date: Tue, 7 Aug 2018 15:16:53 +0900 Subject: [PATCH] Updated UniGLTF --- Scripts/Format/VRMExporter.cs | 4 ++-- Scripts/Format/glTF_VRM_Material.cs | 9 --------- UniGLTF | 2 +- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/Scripts/Format/VRMExporter.cs b/Scripts/Format/VRMExporter.cs index 4dea58798..f6ca74f60 100644 --- a/Scripts/Format/VRMExporter.cs +++ b/Scripts/Format/VRMExporter.cs @@ -108,7 +108,7 @@ namespace VRM gltf.extensions.VRM.meta.title = meta.Title; if (meta.Thumbnail != null) { - gltf.extensions.VRM.meta.texture = TextureIO.ExportTexture(gltf, gltf.buffers.Count - 1, meta.Thumbnail); + gltf.extensions.VRM.meta.texture = TextureIO.ExportTexture(gltf, gltf.buffers.Count - 1, meta.Thumbnail, false); } gltf.extensions.VRM.meta.licenseType = meta.LicenseType; gltf.extensions.VRM.meta.otherLicenseUrl = meta.OtherLicenseUrl; @@ -130,7 +130,7 @@ namespace VRM gltf.extensions.VRM.meta.title = meta.Title; if (meta.Thumbnail != null) { - gltf.extensions.VRM.meta.texture = TextureIO.ExportTexture(gltf, gltf.buffers.Count - 1, meta.Thumbnail); + gltf.extensions.VRM.meta.texture = TextureIO.ExportTexture(gltf, gltf.buffers.Count - 1, meta.Thumbnail, false); } // ussage pemission diff --git a/Scripts/Format/glTF_VRM_Material.cs b/Scripts/Format/glTF_VRM_Material.cs index 4ee67229e..e838b7e6a 100644 --- a/Scripts/Format/glTF_VRM_Material.cs +++ b/Scripts/Format/glTF_VRM_Material.cs @@ -109,15 +109,6 @@ namespace VRM var prop = PreShaderPropExporter.GetPropsForSupportedShader(m.shader.name); if (prop == null) { -#if UNITY_EDITOR - // fallback - Debug.LogWarningFormat("Unsupported shader: {0}", m.shader.name); - prop = ShaderProps.FromShader(m.shader); -#endif - } - - if (prop == null) - { Debug.LogWarningFormat("Fail to export shader: {0}", m.shader.name); } else diff --git a/UniGLTF b/UniGLTF index c481c92e0..826dbf00f 160000 --- a/UniGLTF +++ b/UniGLTF @@ -1 +1 @@ -Subproject commit c481c92e0bef78ef8920e28343fdbbba5a04fdad +Subproject commit 826dbf00f6ec734c460d17b297ef5d5cc453fd24