Merge branch 'pentool' into brushtool

Conflicts:
	imports/codemirror/mode/scheme/scheme.js
	js/tools/BrushTool.js

1 files changed, 6 insertions, 1 deletions

diff --git a/js/tools/RotateStage3DTool.js b/js/tools/RotateStage3DTool.js
index ca2a8bf3..2b312e53 100644..100755
--- a/js/tools/RotateStage3DTool.js
+++ b/js/tools/RotateStage3DTool.js
@@ -131,9 +131,14 @@ exports.RotateStage3DTool = Montage.create(Rotate3DToolBase, {
            var iMat = Matrix.I(4);
 
            ElementsMediator.setMatrix(this.application.ninja.currentDocument.documentRoot, iMat, false);
-
            this.application.ninja.currentDocument.documentRoot.elementModel.props3D.m_transformCtr = null;
 
+                        // let the document and stage manager know about the zoom change
+                        this.application.ninja.stage._firstDraw = true;
+                        this.application.ninja.documentBar.zoomFactor = 100;
+                        this.application.ninja.currentDocument.iframe.style.zoom = 1.0;
+                        this.application.ninja.stage._firstDraw = false;
+
            // TODO - Any updates to the stage should redraw stage's children. Move this to mediator?
            this.application.ninja.stage.updatedStage = true;