Browse Source

Merge pull request #13635 from donmccurdy/bug-gltfloader-default-material

GLTFLoader: Fix default for missing material.pbrMetallicRoughness
Mr.doob 7 years ago
parent
commit
a6e78f8eb7
1 changed files with 2 additions and 6 deletions
  1. 2 6
      examples/js/loaders/GLTFLoader.js

+ 2 - 6
examples/js/loaders/GLTFLoader.js

@@ -1871,14 +1871,14 @@ THREE.GLTFLoader = ( function () {
 			materialType = kmuExtension.getMaterialType( materialDef );
 			pending.push( kmuExtension.extendParams( materialParams, materialDef, parser ) );
 
-		} else if ( materialDef.pbrMetallicRoughness !== undefined ) {
+		} else {
 
 			// Specification:
 			// https://github.com/KhronosGroup/glTF/tree/master/specification/2.0#metallic-roughness-material
 
 			materialType = THREE.MeshStandardMaterial;
 
-			var metallicRoughness = materialDef.pbrMetallicRoughness;
+			var metallicRoughness = materialDef.pbrMetallicRoughness || {};
 
 			materialParams.color = new THREE.Color( 1.0, 1.0, 1.0 );
 			materialParams.opacity = 1.0;
@@ -1909,10 +1909,6 @@ THREE.GLTFLoader = ( function () {
 
 			}
 
-		} else {
-
-			materialType = THREE.MeshPhongMaterial;
-
 		}
 
 		if ( materialDef.doubleSided === true ) {