Explorar o código

Merge pull request #5898 from jeromeetienne/fix-crossOrigin-objmtlloader

fix crossOrigin propagation in OBJMTL loader
Mr.doob %!s(int64=11) %!d(string=hai) anos
pai
achega
5b0c10cd58
Modificáronse 2 ficheiros con 2 adicións e 0 borrados
  1. 1 0
      examples/js/loaders/MTLLoader.js
  2. 1 0
      examples/js/loaders/OBJMTLLoader.js

+ 1 - 0
examples/js/loaders/MTLLoader.js

@@ -87,6 +87,7 @@ THREE.MTLLoader.prototype = {
 		}
 		}
 
 
 		var materialCreator = new THREE.MTLLoader.MaterialCreator( this.baseUrl, this.options );
 		var materialCreator = new THREE.MTLLoader.MaterialCreator( this.baseUrl, this.options );
+		materialCreator.crossOrigin = this.crossOrigin
 		materialCreator.setMaterials( materialsInfo );
 		materialCreator.setMaterials( materialsInfo );
 		return materialCreator;
 		return materialCreator;
 
 

+ 1 - 0
examples/js/loaders/OBJMTLLoader.js

@@ -20,6 +20,7 @@ THREE.OBJMTLLoader.prototype = {
 		var scope = this;
 		var scope = this;
 
 
 		var mtlLoader = new THREE.MTLLoader( url.substr( 0, url.lastIndexOf( "/" ) + 1 ) );
 		var mtlLoader = new THREE.MTLLoader( url.substr( 0, url.lastIndexOf( "/" ) + 1 ) );
+		mtlLoader.crossOrigin = scope.crossOrigin;
 		mtlLoader.load( mtlurl, function ( materials ) {
 		mtlLoader.load( mtlurl, function ( materials ) {
 
 
 			var materialsCreator = materials;
 			var materialsCreator = materials;

粤ICP备19079148号