From 5dd603f4fcb06402cdeffee1ae7371edbc04bb1f Mon Sep 17 00:00:00 2001
From: ousttrue <ousttrue@gmail.com>
Date: Wed, 1 Sep 2021 21:44:03 +0900
Subject: [PATCH] =?UTF-8?q?MaterialDescriptorGenerator=20=E3=82=92=20const?=
 =?UTF-8?q?ructor=20=E7=B5=8C=E7=94=B1=E3=81=AB=E3=81=97=E3=81=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Assets/UniGLTF/Runtime/UniGLTF/IO/ImporterContext.cs | 8 ++++++++
 Assets/VRM/Runtime/IO/VRMImporterContext.cs          | 3 +--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/ImporterContext.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/ImporterContext.cs
index d9ed0dba9..03dd3db36 100644
--- a/Assets/UniGLTF/Runtime/UniGLTF/IO/ImporterContext.cs
+++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/ImporterContext.cs
@@ -19,6 +19,14 @@ namespace UniGLTF
         public AnimationClipFactory AnimationClipFactory { get; }
         public IReadOnlyDictionary<SubAssetKey, UnityEngine.Object> ExternalObjectMap;
 
+        /// <summary>
+        /// UnityObject の 生成(LoadAsync) と 破棄(Dispose) を行う。
+        /// LoadAsync が成功した場合、返り値(RuntimeGltfInstance) に破棄する責務を移動させる。
+        /// </summary>
+        /// <param name="data">Jsonからデシリアライズされた GLTF 情報など</param>
+        /// <param name="externalObjectMap">外部オブジェクトのリスト(主にScriptedImporterのRemapで使う)</param>
+        /// <param name="textureDeserializer">Textureロードをカスタマイズする</param>
+        /// <param name="materialGenerator">Materialロードをカスタマイズする(URP向け)</param>
         public ImporterContext(
             GltfData data,
             IReadOnlyDictionary<SubAssetKey, UnityEngine.Object> externalObjectMap = null,
diff --git a/Assets/VRM/Runtime/IO/VRMImporterContext.cs b/Assets/VRM/Runtime/IO/VRMImporterContext.cs
index 199c32fcf..c085f6bd6 100644
--- a/Assets/VRM/Runtime/IO/VRMImporterContext.cs
+++ b/Assets/VRM/Runtime/IO/VRMImporterContext.cs
@@ -26,11 +26,10 @@ namespace VRM
             IReadOnlyDictionary<SubAssetKey, Object> externalObjectMap = null,
             ITextureDeserializer textureDeserializer = null,
             IMaterialDescriptorGenerator materialGenerator = null)
-            : base(data.Data, externalObjectMap, textureDeserializer)
+            : base(data.Data, externalObjectMap, textureDeserializer, materialGenerator ?? new VRMMaterialDescriptorGenerator(data.VrmExtensions))
         {
             _data = data;
             TextureDescriptorGenerator = new VrmTextureDescriptorGenerator(Data, VRM);
-            MaterialDescriptorGenerator = materialGenerator ?? new VRMMaterialDescriptorGenerator(VRM);
         }
 
         #region OnLoad