Merge remote-tracking branch 'ninja-internal/master' into test-merge

Conflicts:
	js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
	js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
	js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js

1 files changed, 3 insertions, 3 deletions

diff --git a/js/helper-classes/3D/snap-manager.js b/js/helper-classes/3D/snap-manager.js
index a8b6e739..0157140f 100755
--- a/js/helper-classes/3D/snap-manager.js
+++ b/js/helper-classes/3D/snap-manager.js
@@ -496,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;
 
@@ -987,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 );
@@ -1009,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