提交 ea49913e 编写于 作者: M Mr.doob

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

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
of this software and associated documentation files (the "Software"), to deal
......
......@@ -87,6 +87,7 @@ THREE.MTLLoader.prototype = {
}
var materialCreator = new THREE.MTLLoader.MaterialCreator( this.baseUrl, this.options );
materialCreator.crossOrigin = this.crossOrigin
materialCreator.setMaterials( materialsInfo );
return materialCreator;
......
......@@ -20,6 +20,7 @@ THREE.OBJMTLLoader.prototype = {
var scope = this;
var mtlLoader = new THREE.MTLLoader( url.substr( 0, url.lastIndexOf( "/" ) + 1 ) );
mtlLoader.crossOrigin = scope.crossOrigin;
mtlLoader.load( mtlurl, function ( materials ) {
var materialsCreator = materials;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册