Browse Source

Merge branch 'patch-3' of https://github.com/jayschwa/three.js into dev

# Conflicts:
#	docs/api/en/textures/Texture.html
Mr.doob 7 years ago
parent
commit
2cf6e119c4
1 changed files with 3 additions and 1 deletions
  1. 3 1
      src/textures/Texture.js

+ 3 - 1
src/textures/Texture.js

@@ -225,7 +225,7 @@ Texture.prototype = Object.assign( Object.create( EventDispatcher.prototype ), {
 
 	transformUv: function ( uv ) {
 
-		if ( this.mapping !== UVMapping ) return;
+		if ( this.mapping !== UVMapping ) return uv;
 
 		uv.applyMatrix3( this.matrix );
 
@@ -297,6 +297,8 @@ Texture.prototype = Object.assign( Object.create( EventDispatcher.prototype ), {
 
 		}
 
+		return uv;
+
 	}
 
 } );