scratchfoundation/paper.js
1
0
Fork 0
mirror of https://github.com/scratchfoundation/paper.js.git synced 2025-01-01 02:38:43 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix errors introduced by bad merge.

Browse source
This commit is contained in:
Jürg Lehni 2011-03-02 08:52:13 +01:00
parent 3f972be500
commit 8c96d91400
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/basic/Matrix.js
View file

@ -454,7 +454,7 @@ var Matrix = Base.extend({
/**
* Applies this matrix to the specified Canvas Context.
*/
applyToContext: function(context) {
applyToContext: function(context, reset) {
// Canvas contexts seem to use another orientation: The scaleX (m00) and
// scaleY (m11) values need to be flipped to get correct behaviour e.g.
// when using rotation or shearing.
@ -469,7 +469,6 @@ var Matrix = Base.extend({
-this._m11, this._m02, this._m12
);
}
>>>>>>> origin/master
},
statics: {