Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures

1 files changed, 3 insertions, 3 deletions

diff --git a/js/tools/SelectionTool.js b/js/tools/SelectionTool.js
index 7033ee3d..855c7b8c 100755
--- a/js/tools/SelectionTool.js
+++ b/js/tools/SelectionTool.js
@@ -751,10 +751,10 @@ var SelectionTool = exports.SelectionTool = Montage.create(ModifierToolBase, {
 
             var zoomFactor = 1;
             var viewPort = this.application.ninja.stage._viewport;
-            if (viewPort.style && viewPort.style.zoom)
-            {
+            if (viewPort && viewPort.style && viewPort.style.zoom) {
                 zoomFactor = Number(viewPort.style.zoom);
             }
+
             var tmpMat = viewUtils.getLocalToGlobalMatrix( item );
             for (var j=0;  j<4;  j++)
             {
@@ -863,7 +863,7 @@ var SelectionTool = exports.SelectionTool = Montage.create(ModifierToolBase, {
 
             var zoomFactor = 1;
             var viewPort = this.application.ninja.stage._viewport;
-            if (viewPort.style && viewPort.style.zoom)
+            if (viewPort && viewPort.style && viewPort.style.zoom)
             {
                 zoomFactor = Number(viewPort.style.zoom);
             }