aboutsummaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorPushkar Joshi2012-04-17 16:17:36 -0700
committerPushkar Joshi2012-04-17 16:17:36 -0700
commit2165b91022d3585720db881cf97bc971eb7fcce8 (patch)
tree504ad6cddae6cd5efb650b67270dba70fe67d41f /js
parentdf903a01e14134cadf109b733d09c6eadfa3966b (diff)
downloadninja-2165b91022d3585720db881cf97bc971eb7fcce8.tar.gz
took out bad merge line and use different function for converting points from local to global coords (the latter should be a temporary change as I will significantly change this)
Diffstat (limited to 'js')
-rwxr-xr-xjs/tools/PenTool.js4
1 files changed, 1 insertions, 3 deletions
diff --git a/js/tools/PenTool.js b/js/tools/PenTool.js
index aba25ca9..7bc0364e 100755
--- a/js/tools/PenTool.js
+++ b/js/tools/PenTool.js
@@ -743,7 +743,7 @@ exports.PenTool = Montage.create(ShapeTool, {
743 //this transformation will take the path points from local space to stage world space 743 //this transformation will take the path points from local space to stage world space
744 // *without* taking into account the transformation applied to this canvas 744 // *without* taking into account the transformation applied to this canvas
745 // (this is because we use the center of the bbox to find a place for the canvas) 745 // (this is because we use the center of the bbox to find a place for the canvas)
746 var localToStageWorldMat = ViewUtils.getLocalToStageWorldMatrix(this._selectedSubpathCanvas, true, false); 746 var localToStageWorldMat = ViewUtils.getObjToStageWorldMatrix(this._selectedSubpathCanvas, false);//ViewUtils.getLocalToStageWorldMatrix(this._selectedSubpathCanvas, true, false);
747 for (i=0;i<numAnchors;i++){ 747 for (i=0;i<numAnchors;i++){
748 //convert this anchor from local to stage world 748 //convert this anchor from local to stage world
749 var currAnchor = this._selectedSubpath.getAnchor(i); 749 var currAnchor = this._selectedSubpath.getAnchor(i);
@@ -904,8 +904,6 @@ exports.PenTool = Montage.create(ShapeTool, {
904 this.DrawSubpathAnchors(this._selectedSubpath); 904 this.DrawSubpathAnchors(this._selectedSubpath);
905 } 905 }
906 }, 906 },
907
908 var elementModel = TagTool.makeElement(parseInt(w), parseInt(h), planeMat, midPt, newCanvas, true);
909 907
910 BuildSecondCtrlPoint:{ 908 BuildSecondCtrlPoint:{
911 value: function(p0, p2, p3) { 909 value: function(p0, p2, p3) {