Browse Source

fix webp extension with no handler

Garrett Johnson 4 years ago
parent
commit
33155151cd
2 changed files with 26 additions and 2 deletions
  1. 13 1
      examples/js/loaders/GLTFLoader.js
  2. 13 1
      examples/jsm/loaders/GLTFLoader.js

+ 13 - 1
examples/js/loaders/GLTFLoader.js

@@ -763,7 +763,19 @@ THREE.GLTFLoader = ( function () {
 
 
 		var extension = textureDef.extensions[ name ];
 		var extension = textureDef.extensions[ name ];
 		var source = json.images[ extension.source ];
 		var source = json.images[ extension.source ];
-		var loader = source.uri ? parser.options.manager.getHandler( source.uri ) : parser.textureLoader;
+
+		var loader;
+		if ( source.uri ) {
+
+			loader = parser.options.getHandler( source.uri );
+
+		}
+
+		if ( ! loader ) {
+
+			loader = parser.textureLoader;
+
+		}
 
 
 		return this.detectSupport().then( function ( isSupported ) {
 		return this.detectSupport().then( function ( isSupported ) {
 
 

+ 13 - 1
examples/jsm/loaders/GLTFLoader.js

@@ -828,7 +828,19 @@ var GLTFLoader = ( function () {
 
 
 		var extension = textureDef.extensions[ name ];
 		var extension = textureDef.extensions[ name ];
 		var source = json.images[ extension.source ];
 		var source = json.images[ extension.source ];
-		var loader = source.uri ? parser.options.manager.getHandler( source.uri ) : parser.textureLoader;
+
+		var loader;
+		if ( source.uri ) {
+
+			loader = parser.options.getHandler( source.uri );
+
+		}
+
+		if ( ! loader ) {
+
+			loader = parser.textureLoader;
+
+		}
 
 
 		return this.detectSupport().then( function ( isSupported ) {
 		return this.detectSupport().then( function ( isSupported ) {