aboutsummaryrefslogtreecommitdiff
path: root/js/helper-classes/3D/draw-utils.js
diff options
context:
space:
mode:
authorJonathan Duran2012-06-11 10:12:08 -0700
committerJonathan Duran2012-06-11 10:12:08 -0700
commit6a3b09433b8d5894a0f2a6c00748825727c2d991 (patch)
tree377cd68e0580172bc234059dbd4482c964d49bd4 /js/helper-classes/3D/draw-utils.js
parent79cbc26904a7fbd7a846f48da6c026a91221ba93 (diff)
parentbad5a44824ba35cbc7f4f4d245e32b90208f00c1 (diff)
downloadninja-6a3b09433b8d5894a0f2a6c00748825727c2d991.tar.gz
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Diffstat (limited to 'js/helper-classes/3D/draw-utils.js')
-rwxr-xr-xjs/helper-classes/3D/draw-utils.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/js/helper-classes/3D/draw-utils.js b/js/helper-classes/3D/draw-utils.js
index eef28dce..bef1e435 100755
--- a/js/helper-classes/3D/draw-utils.js
+++ b/js/helper-classes/3D/draw-utils.js
@@ -1206,7 +1206,7 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
1206 // set the element to be the viewport object - temporarily 1206 // set the element to be the viewport object - temporarily
1207 var tmpCanvas = this.application.ninja.stage.canvas; 1207 var tmpCanvas = this.application.ninja.stage.canvas;
1208 var tmpStage = this.application.ninja.currentDocument.model.documentRoot; 1208 var tmpStage = this.application.ninja.currentDocument.model.documentRoot;
1209 this.viewUtils.pushViewportObj( tmpCanvas ); 1209// this.viewUtils.pushViewportObj( tmpCanvas );
1210 1210
1211 // save the source space object and set to the target object 1211 // save the source space object and set to the target object
1212 var saveSource = this._sourceSpaceElt; 1212 var saveSource = this._sourceSpaceElt;
@@ -1279,7 +1279,7 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
1279 this.drawArrowHead(rO, zO); 1279 this.drawArrowHead(rO, zO);
1280 1280
1281 // restore the state 1281 // restore the state
1282 this.viewUtils.popViewportObj(); 1282// this.viewUtils.popViewportObj();
1283 this._drawingContext.restore(); 1283 this._drawingContext.restore();
1284 this.setDrawingSurfaceElement(saveContext); 1284 this.setDrawingSurfaceElement(saveContext);
1285 this._lineColor = saveColor; 1285 this._lineColor = saveColor;