Browse Source

Clean up.

Mr.doob 8 years ago
parent
commit
722473808f
2 changed files with 6 additions and 2 deletions
  1. 5 1
      src/loaders/ImageLoader.js
  2. 1 1
      src/objects/Mesh.js

+ 5 - 1
src/loaders/ImageLoader.js

@@ -68,7 +68,11 @@ Object.assign( ImageLoader.prototype, {
 
 		}, false );
 
-		if ( this.crossOrigin !== undefined && url.indexOf( 'data:' ) !== 0 ) image.crossOrigin = this.crossOrigin;
+		if ( url.substr( 0, 5 ) !== 'data:' ) {
+
+			if ( this.crossOrigin !== undefined ) image.crossOrigin = this.crossOrigin;
+
+		}
 
 		scope.manager.itemStart( url );
 

+ 1 - 1
src/objects/Mesh.js

@@ -316,7 +316,7 @@ Mesh.prototype = Object.assign( Object.create( Object3D.prototype ), {
 
 					if ( intersection ) {
 
-				    if ( uvs && uvs[ f ] ) {
+						if ( uvs && uvs[ f ] ) {
 
 							var uvs_f = uvs[ f ];
 							uvA.copy( uvs_f[ 0 ] );