浏览代码

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

Mr.doob 12 年之前
父节点
当前提交
bb6591efed
共有 1 个文件被更改,包括 4 次插入0 次删除
  1. 4 0
      src/loaders/JSONLoader.js

+ 4 - 0
src/loaders/JSONLoader.js

@@ -7,6 +7,8 @@ THREE.JSONLoader = function ( showStatus ) {
 
 
 	THREE.Loader.call( this, showStatus );
 	THREE.Loader.call( this, showStatus );
 
 
+	this.withCredentials = false;
+
 };
 };
 
 
 THREE.JSONLoader.prototype = Object.create( THREE.Loader.prototype );
 THREE.JSONLoader.prototype = Object.create( THREE.Loader.prototype );
@@ -28,6 +30,8 @@ THREE.JSONLoader.prototype.loadAjaxJSON = function ( context, url, callback, tex
 
 
 	var length = 0;
 	var length = 0;
 
 
+	xhr.withCredentials = this.withCredentials;
+
 	xhr.onreadystatechange = function () {
 	xhr.onreadystatechange = function () {
 
 
 		if ( xhr.readyState === xhr.DONE ) {
 		if ( xhr.readyState === xhr.DONE ) {