提交 2cf6e119 编写于 作者: M Mr.doob

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

# Conflicts:
#	docs/api/en/textures/Texture.html
......@@ -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;
}
} );
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册