Skip to content

Commit

Permalink
Merge pull request mrdoob#16250 from WestLangley/dev-object_apply_matrix
Browse files Browse the repository at this point in the history
Object3D: make applyMatrix() more robust
  • Loading branch information
mrdoob authored Apr 16, 2019
2 parents f36f2fd + 6745ce0 commit 3a04b06
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion src/core/Object3D.js
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,9 @@ Object3D.prototype = Object.assign( Object.create( EventDispatcher.prototype ),

applyMatrix: function ( matrix ) {

this.matrix.multiplyMatrices( matrix, this.matrix );
if ( this.matrixAutoUpdate ) this.updateMatrix();

this.matrix.premultiply( matrix );

this.matrix.decompose( this.position, this.quaternion, this.scale );

Expand Down

0 comments on commit 3a04b06

Please sign in to comment.