From a9f38faa34de0edb29f49a94c046a29f55e33d1e Mon Sep 17 00:00:00 2001 From: Takahiro Date: Sun, 8 Jan 2017 21:27:34 -0800 Subject: [PATCH] Accepet non-defined material.values JSON --- examples/js/loaders/GLTFLoader.js | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/examples/js/loaders/GLTFLoader.js b/examples/js/loaders/GLTFLoader.js index 84a3f8ca75..b430f03dbc 100644 --- a/examples/js/loaders/GLTFLoader.js +++ b/examples/js/loaders/GLTFLoader.js @@ -968,7 +968,9 @@ THREE.GLTFLoader = ( function () { if ( WEBGL_TYPE[ ptype ] ) { var pcount = shaderParam.count; - var value = material.values[ pname ]; + var value; + + if ( material.values !== undefined ) value = material.values[ pname ]; var uvalue = new WEBGL_TYPE[ ptype ](); var usemantic = shaderParam.semantic; @@ -1065,7 +1067,19 @@ THREE.GLTFLoader = ( function () { case WEBGL_CONSTANTS.SAMPLER_2D: - uvalue = value ? dependencies.textures[ value ] : null; + if ( value !== undefined ) { + + uvalue = dependencies.textures[ value ]; + + } else if ( shaderParam.value !== undefined ) { + + uvalue = dependencies.textures[ shaderParam.value ]; + + } else { + + uvalue = null; + + } break; -- GitLab