JavaScriptsShare
diff --git a/‎build/three.js
Lines changed: 14 additions & 8 deletions b/‎build/three.js
Lines changed: 14 additions & 8 deletions
diff --git a/‎build/three.min.js
Lines changed: 9 additions & 9 deletions b/‎build/three.min.js
Lines changed: 9 additions & 9 deletions
@@ -23910,7 +23910,7 @@ THREE.WebGLRenderer = function ( parameters ) {
 		}
 
 		var image = texture.image,
-		isImagePowerOfTwo = isPowerOfTwo( image ), // TODO: Always true at this step?
+		isImagePowerOfTwo = isPowerOfTwo( image ),
 		glFormat = paramThreeToGL( texture.format ),
 		glType = paramThreeToGL( texture.type );
 
@@ -24077,16 +24077,22 @@ THREE.WebGLRenderer = function ( parameters ) {
 
 	function makePowerOfTwo( image ) {
 
-		var canvas = document.createElement( 'canvas' );
-		canvas.width = THREE.Math.nearestPowerOfTwo( image.width );
-		canvas.height = THREE.Math.nearestPowerOfTwo( image.height );
+		if ( image instanceof HTMLImageElement || image instanceof HTMLCanvasElement ) {
 
-		var context = canvas.getContext( '2d' );
-		context.drawImage( image, 0, 0, canvas.width, canvas.height );
+			var canvas = document.createElement( 'canvas' );
+			canvas.width = THREE.Math.nearestPowerOfTwo( image.width );
+			canvas.height = THREE.Math.nearestPowerOfTwo( image.height );
+
+			var context = canvas.getContext( '2d' );
+			context.drawImage( image, 0, 0, canvas.width, canvas.height );
 
-		console.warn( 'THREE.WebGLRenderer: image is not power of two (' + image.width + 'x' + image.height + '). Resized to ' + canvas.width + 'x' + canvas.height, image );
+			console.warn( 'THREE.WebGLRenderer: image is not power of two (' + image.width + 'x' + image.height + '). Resized to ' + canvas.width + 'x' + canvas.height, image );
 
-		return canvas;
+			return canvas;
+
+		}
+
+		return image;
 
 	}