Merge branch 'FileIO' of github.com:joseeight/ninja-internal into FileIO

Conflicts:
	js/io/document/document-controller.js
	js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js
	js/io/ui/save-as-dialog.reel/save-as-dialog.js

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>

1 files changed, 10 insertions, 1 deletions

diff --git a/js/helper-classes/3D/snap-manager.js b/js/helper-classes/3D/snap-manager.js
index 3ed96082..8819f637 100755
--- a/js/helper-classes/3D/snap-manager.js
+++ b/js/helper-classes/3D/snap-manager.js
@@ -1780,7 +1780,7 @@ var SnapManager = exports.SnapManager = Montage.create(Component, {
                         var mergedSnap = this.mergeHitRecords( hitRecs );
                         if (mergedSnap)
                         {
-                                while (hitRecs.length > 0)  hitRecs.pop();
+                                while (hitRecs.length > 0) hitRecs.pop();
                                 hitRecs.push( mergedSnap );
                                 //console.log( "merged snaps" );
                         }
@@ -1836,6 +1836,9 @@ var SnapManager = exports.SnapManager = Montage.create(Component, {
                                                 hSnap.setLocalPoint( localPt );
                                                 hSnap.setScreenPoint( scrPt );
                                                 hSnap.setType( hSnap.SNAP_TYPE_ALIGN_MERGED );
+                                                hSnap.setElement( stage );
+                                                hSnap.setPlane( [0,0,1,0] );
+                                                hSnap.setPlaneMatrix( Matrix.I(4) );
                                                 if (vSnap.hasAssociatedScreenPoint() )
                                                         hSnap.setAssociatedScreenPoint( vSnap.getAssociatedScreenPoint() );
                                                 if (vSnap.hasAssociatedScreenPoint2() )
@@ -1882,6 +1885,9 @@ var SnapManager = exports.SnapManager = Montage.create(Component, {
                                                 hSnap.setLocalPoint( localPt );
                                                 hSnap.setScreenPoint( scrPt );
                                                 hSnap.setType( hSnap.SNAP_TYPE_ALIGN_MERGED );
+                                                hSnap.setElement( stage );
+                                                hSnap.setPlane( [0,0,1,0] );
+                                                hSnap.setPlaneMatrix( Matrix.I(4) );
                                                 if (vSnap.hasAssociatedScreenPoint() )
                                                         hSnap.setAssociatedScreenPoint( vSnap.getAssociatedScreenPoint() );
                                                 if (vSnap.hasAssociatedScreenPoint2() )
@@ -1934,6 +1940,9 @@ var SnapManager = exports.SnapManager = Montage.create(Component, {
                                                         hSnap.setLocalPoint( localPt );
                                                         hSnap.setScreenPoint( scrPt );
                                                         hSnap.setType( hSnap.SNAP_TYPE_ALIGN_MERGED );
+                                                        hSnap.setElement( stage );
+                                                        hSnap.setPlane( [0,0,1,0] );
+                                                        hSnap.setPlaneMatrix( Matrix.I(4) );
                                                         if (vSnap.hasAssociatedScreenPoint() )
                                                                 hSnap.setAssociatedScreenPoint( vSnap.getAssociatedScreenPoint() );
                                                         if (vSnap.hasAssociatedScreenPoint2() )