Editor: Fixed collada.

editor/js/Loader.js

@@ -113,14 +113,12 @@ var Loader = function ( editor ) {
 					var xml = parser.parseFromString( contents, 'text/xml' );
 
 					var loader = new THREE.ColladaLoader();
-					loader.parse( xml, function ( collada ) {
+					var collada = loader.parse( xml );
 
-						collada.scene.name = filename;
+					collada.scene.name = filename;
 
-						editor.addObject( collada.scene );
-						editor.select( collada.scene );
-
-					} );
+					editor.addObject( collada.scene );
+					editor.select( collada.scene );
 
 				}, false );
 				reader.readAsText( file );

examples/js/loaders/ColladaLoader.js

@@ -96,6 +96,10 @@
 				loader.setCrossOrigin( this.crossOrigin );
 				loader.load( url, function ( text ) {
 
+					var parts = url.split( '/' );
+					parts.pop();
+					baseUrl = ( parts.length < 1 ? '.' : parts.join( '/' ) ) + '/';
+
 					var xmlParser = new DOMParser();
 					var responseXML = xmlParser.parseFromString( text, "application/xml" );
 					onLoad( scope.parse( responseXML, url ) );
@@ -116,18 +120,10 @@
 
 		},
 
-		parse: function( doc, url ) {
+		parse: function( doc ) {
 
 			COLLADA = doc;
 
-			if ( url !== undefined ) {
-
-				var parts = url.split( '/' );
-				parts.pop();
-				baseUrl = ( parts.length < 1 ? '.' : parts.join( '/' ) ) + '/';
-
-			}
-
 			this.parseAsset();
 			this.setUpConversion();
 			images = this.parseLib( "library_images image", _Image, "image" );
@@ -2816,7 +2812,7 @@
 
 									var image = images[ surface.init_from ];
 
-									if ( image ) {
+									if ( image && baseUrl ) {
 
 										var url = baseUrl + image.init_from;