Prechádzať zdrojové kódy

Merge remote-tracking branch 'origin/dev' into dev

Mr.doob 10 rokov pred
rodič
commit
ea49913e21

+ 1 - 1
LICENSE

@@ -1,6 +1,6 @@
 The MIT License
 The MIT License
 
 
-Copyright © 2010-2014 three.js authors
+Copyright © 2010-2015 three.js authors
 
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
 of this software and associated documentation files (the "Software"), to deal

+ 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;