Skip to content

Commit 2cf6e11

Browse files
committed
Merge branch 'patch-3' of https://github.com/jayschwa/three.js into dev
# Conflicts: # docs/api/en/textures/Texture.html
2 parents 454cc07 + c6354ae commit 2cf6e11

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

src/textures/Texture.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ Texture.prototype = Object.assign( Object.create( EventDispatcher.prototype ), {
225225

226226
transformUv: function ( uv ) {
227227

228-
if ( this.mapping !== UVMapping ) return;
228+
if ( this.mapping !== UVMapping ) return uv;
229229

230230
uv.applyMatrix3( this.matrix );
231231

@@ -297,6 +297,8 @@ Texture.prototype = Object.assign( Object.create( EventDispatcher.prototype ), {
297297

298298
}
299299

300+
return uv;
301+
300302
}
301303

302304
} );

0 commit comments

Comments
 (0)