Browse Source

Merge branch 'master' into dev

Mr.doob 13 years ago
parent
commit
baa1a93562
1 changed files with 7 additions and 0 deletions
  1. 7 0
      examples/js/loaders/ColladaLoader.js

+ 7 - 0
examples/js/loaders/ColladaLoader.js

@@ -74,6 +74,13 @@ THREE.ColladaLoader = function () {
 							readyCallbackFunc = readyCallback;
 							parse( request.responseXML, undefined, url );
 
+						} else if ( request.responseText ) {
+
+							readyCallbackFunc = readyCallback;
+							var xmlParser = new DOMParser();
+							var responseXML = xmlParser.parseFromString( request.responseText, "application/xml" );
+							parse( responseXML, undefined, url );
+
 						} else {
 
 							console.error( "ColladaLoader: Empty or non-existing file (" + url + ")" );