From b8b306651381894356d7a44dfaff59f10b4cf0e9 Mon Sep 17 00:00:00 2001 From: ousttrue Date: Thu, 21 Jun 2018 22:20:49 +0900 Subject: [PATCH] Updated UniGLTF --- Scripts/Format/VRMImporter.cs | 4 ++-- Scripts/Format/VRMImporterContext.cs | 2 +- Scripts/Format/glTF_VRM_Material.cs | 2 +- UniGLTF | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Scripts/Format/VRMImporter.cs b/Scripts/Format/VRMImporter.cs index 9b8230f48..8f10fb7e5 100644 --- a/Scripts/Format/VRMImporter.cs +++ b/Scripts/Format/VRMImporter.cs @@ -410,7 +410,7 @@ namespace VRM for (int i = 0; i < context.GLTF.textures.Count; ++i) { var x = new TextureItem(context.GLTF, i); - x.Process(storage); + x.Process(context.GLTF, storage); context.Textures.Add(x); yield return null; } @@ -562,7 +562,7 @@ namespace VRM () => { var texture = new TextureItem(ctx.GLTF, index); - texture.Process(ctx.Storage); + texture.Process(ctx.GLTF, ctx.Storage); return texture; }) .ContinueWith(Scheduler.ThreadPool, x => ctx.Textures.Add(x)); diff --git a/Scripts/Format/VRMImporterContext.cs b/Scripts/Format/VRMImporterContext.cs index ef74c3357..a341fb1ee 100644 --- a/Scripts/Format/VRMImporterContext.cs +++ b/Scripts/Format/VRMImporterContext.cs @@ -58,7 +58,7 @@ namespace VRM if(gltfMeta.texture >= 0 && gltfMeta.texture < VRM.textures.Count) { var t = new TextureItem(VRM, gltfMeta.texture); - t.Process(Storage); + t.Process(VRM, Storage); meta.Thumbnail=t.Texture; } } diff --git a/Scripts/Format/glTF_VRM_Material.cs b/Scripts/Format/glTF_VRM_Material.cs index 8ed73b21f..a7eeecfae 100644 --- a/Scripts/Format/glTF_VRM_Material.cs +++ b/Scripts/Format/glTF_VRM_Material.cs @@ -98,7 +98,7 @@ namespace VRM return materials; } - public static glTF_VRM_Material CreateFromMaterial(Material m, List textures) + public static glTF_VRM_Material CreateFromMaterial(Material m, List textures) { var material = new glTF_VRM_Material { diff --git a/UniGLTF b/UniGLTF index 673a00366..debe1dcbe 160000 --- a/UniGLTF +++ b/UniGLTF @@ -1 +1 @@ -Subproject commit 673a003669e78333cfc27c78417c797784fe9a36 +Subproject commit debe1dcbe02438413f1cc54c19f677fe44b01f05