diff --git a/Assets/VRM10_Samples/VRM10Viewer/TinyPbrDescriptorGenerator.cs b/Assets/VRM10_Samples/VRM10Viewer/TinyPbrDescriptorGenerator.cs index a05a8d58c..7ebc55bfe 100644 --- a/Assets/VRM10_Samples/VRM10Viewer/TinyPbrDescriptorGenerator.cs +++ b/Assets/VRM10_Samples/VRM10Viewer/TinyPbrDescriptorGenerator.cs @@ -14,11 +14,11 @@ namespace UniVRM10.VRM10Viewer public UrpGltfPbrMaterialImporter PbrMaterialImporter { get; } = new(); public UrpGltfDefaultMaterialImporter DefaultMaterialImporter { get; } = new(); - public Material CustomMaterial { get; set; } + public Material Material { get; set; } - public TinyPbrDescriptorGenerator(Material customMaterial) + public TinyPbrDescriptorGenerator(Material material) { - CustomMaterial = customMaterial; + Material = material; } public MaterialDescriptor Get(GltfData data, int i) @@ -52,7 +52,7 @@ namespace UniVRM10.VRM10Viewer var src = data.GLTF.materials[i]; matDesc = new MaterialDescriptor( GltfMaterialImportUtils.ImportMaterialName(i, src), - CustomMaterial.shader, + Material.shader, null, new Dictionary(), new Dictionary(), diff --git a/Assets/VRM10_Samples/VRM10Viewer/VRM10Viewer.unity b/Assets/VRM10_Samples/VRM10Viewer/VRM10Viewer.unity index cb53df676..dcd3d9073 100644 --- a/Assets/VRM10_Samples/VRM10Viewer/VRM10Viewer.unity +++ b/Assets/VRM10_Samples/VRM10Viewer/VRM10Viewer.unity @@ -4736,7 +4736,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: _primitiveType: 4 - _urpMaterial: {fileID: -876546973899608171, guid: ac58f8c11a130e04ba883a82ae4b78e4, + _urpMaterialForGrayscale: {fileID: -876546973899608171, guid: ac58f8c11a130e04ba883a82ae4b78e4, type: 3} --- !u!1 &325720722 GameObject: @@ -13432,7 +13432,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: _primitiveType: 0 - _urpMaterial: {fileID: -876546973899608171, guid: ac58f8c11a130e04ba883a82ae4b78e4, + _urpMaterialForGrayscale: {fileID: -876546973899608171, guid: ac58f8c11a130e04ba883a82ae4b78e4, type: 3} --- !u!1 &806723448 GameObject: