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

Conflicts:
	assets/canvas-runtime.js
	js/io/system/ninjalibrary.json
	js/mediators/element-mediator.js

3 files changed, 13 insertions, 22 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, {
                         // set the element to be the viewport object - temporarily
                         var tmpCanvas = this.application.ninja.stage.canvas;
                         var tmpStage = this.application.ninja.currentDocument.model.documentRoot;
-                        this.viewUtils.pushViewportObj( tmpCanvas );
+//                      this.viewUtils.pushViewportObj( tmpCanvas );
 
                         // save the source space object and set to the target object
                         var saveSource = this._sourceSpaceElt;
@@ -1279,7 +1279,7 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
                         this.drawArrowHead(rO, zO);
 
                         // restore the state
-                        this.viewUtils.popViewportObj();
+//                      this.viewUtils.popViewportObj();
                         this._drawingContext.restore();
                         this.setDrawingSurfaceElement(saveContext);
                         this._lineColor = saveColor;
diff --git a/js/helper-classes/3D/math-utils.js b/js/helper-classes/3D/math-utils.js
index 2f0283a9..35ee8112 100755
--- a/js/helper-classes/3D/math-utils.js
+++ b/js/helper-classes/3D/math-utils.js
@@ -928,17 +928,18 @@ var MathUtilsClass = exports.MathUtilsClass = Object.create(Object.prototype, {
                 return 0;
             }
             //TODO testing...remove this block
-            console.log("getAxisAngleBetween3DVectors Angle: "+angle);
             if (isNaN(angle)){
-                console.log("getAxisAngleBetween3DVectors Angle is NaN");
+                console.log("Warning! getAxisAngleBetween3DVectors Angle is NaN");
             }
             //TODO end testing block
             //optionally, if axis is provided, create the axis of rotation as well
             var rotAxis = VecUtils.vecCross(3, v1n, v2n);
             rotAxis = VecUtils.vecNormalize(3, rotAxis, 1);
-            axis[0] = rotAxis[0];
-            axis[1] = rotAxis[1];
-            axis[2] = rotAxis[2];
+            if (axis){
+                axis[0] = rotAxis[0];
+                axis[1] = rotAxis[1];
+                axis[2] = rotAxis[2];
+            }
             return angle;
         }
     },
diff --git a/js/helper-classes/3D/snap-manager.js b/js/helper-classes/3D/snap-manager.js
index e3756f32..0157140f 100755
--- a/js/helper-classes/3D/snap-manager.js
+++ b/js/helper-classes/3D/snap-manager.js
@@ -481,10 +481,8 @@ var SnapManager = exports.SnapManager = Montage.create(Component, {
                                 {
                                         var snapRec = this._elementCache[i];
                                         var elt = snapRec.getElement();
-                                        if (elt.elementModel)
-                        elt.elementModel.isIn2DSnapCache = false;
-                                        else
-                                                console.log( "element in the 2D cache does not have an elementModel" );
+                    elt.elementModel.isIn2DSnapCache = false;
+
                                 }
 
                                 this._elementCache = null;
@@ -498,7 +496,7 @@ var SnapManager = exports.SnapManager = Montage.create(Component, {
                         this._elementCache = new Array;
 
 //                      var stage = this.getStage();
-                        var stage = this.application.ninja.currentSelectedContainer || this.getStage();
+                        var stage = this.application.ninja.currentDocument.model.domContainer || this.getStage();
                         this.hLoadElementCache( stage,  plane, 0 );
             this._isCacheInvalid = false;
 
@@ -541,10 +539,6 @@ var SnapManager = exports.SnapManager = Montage.create(Component, {
                                                 snapRec.init( elt );
                                                 this._elementCache.push( snapRec );
 
-                                                if (!elt.elementModel)
-                                                {
-                            NJUtils.makeModelFromElement(elt);
-                                                }
                                                 elt.elementModel.isIn2DSnapCache = true;
                                         }
                                         else if (elt.elementModel)
@@ -613,10 +607,6 @@ var SnapManager = exports.SnapManager = Montage.create(Component, {
                                         snapRec.init( elt );
                                         this._elementCache.push( snapRec );
 
-                                        if (!elt.elementModel)
-                                        {
-                                                NJUtils.makeModelFromElement(elt);
-                                        }
                                         elt.elementModel.isIn2DSnapCache = true;
                                 }
                                 else if (elt.elementModel)
@@ -997,7 +987,7 @@ var SnapManager = exports.SnapManager = Montage.create(Component, {
                 value: function( screenPt,  hitRecs ) {
                         // start at the stage.
 //                      var stage = this.getStage();
-            var stage = this.application.ninja.currentSelectedContainer || this.getStage();
+            var stage = this.application.ninja.currentDocument.model.domContainer || this.getStage();
 
                         // the root should be the 'view' canvas, so the first matrix is the camera
                         viewUtils.setViewportObj( stage );
@@ -1019,7 +1009,7 @@ var SnapManager = exports.SnapManager = Montage.create(Component, {
             }
                         // hit test the current object
                         var hit;
-                        var snapToStage = ((depth === 0) && (elt === this.application.ninja.currentSelectedContainer) && (elt.nodeName === 'CANVAS'));
+                        var snapToStage = ((depth === 0) && (elt === this.application.ninja.currentDocument.model.domContainer) && (elt.nodeName === 'CANVAS'));
                         if ((depth > 0) || snapToStage) // don't snap to the root unles we are working inside a canvas
                         {
                                 // if the element is in the 2D cache snapping is done there