3 files changed, 23 insertions, 4 deletions

diff --git a/js/helper-classes/3D/snap-manager.js b/js/helper-classes/3D/snap-manager.js
index 7194524e..e22ac3ad 100755
--- a/js/helper-classes/3D/snap-manager.js
+++ b/js/helper-classes/3D/snap-manager.js
@@ -456,6 +456,13 @@ var SnapManager = exports.SnapManager = Montage.create(Component, {
                 }
         },
 
+    reload2DCache: {
+        value: function() {
+            this.clear2DCache();
+            this.load2DCache(workingPlane);
+        }
+    },
+
         clear2DCache : {
                 value : function() {
                         // clear the 2D cache flags in the objects
diff --git a/js/ninja.reel/ninja.js b/js/ninja.reel/ninja.js
index ba87e2d5..067a005f 100755
--- a/js/ninja.reel/ninja.js
+++ b/js/ninja.reel/ninja.js
@@ -134,10 +134,21 @@ exports.Ninja = Montage.create(Component, {
         value: []
     },
 
-    currentSelectedContainer: {
+    _currentSelectedContainer: {
         value: null
     },
 
+    currentSelectedContainer: {
+        get: function() {
+            return this._currentSelectedContainer;
+        },
+        set: function(value) {
+            if(value !== this._currentSelectedContainer) {
+                this._currentSelectedContainer = value;
+            }
+        }
+    },
+
     templateDidLoad: {
         value: function() {
             this.ninjaVersion = window.ninjaVersion.ninja.version;
@@ -285,7 +296,7 @@ exports.Ninja = Montage.create(Component, {
             this.currentDocument = this.documentController.activeDocument;
 
             if(this.currentDocument.documentRoot) {
-                this.application.ninja.currentSelectedContainer = this.currentDocument.documentRoot;
+                this._currentSelectedContainer = this.selectionController._currentSelectedContainer = this.currentDocument.documentRoot;
             }
         }
     },
diff --git a/js/stage/stage-deps.js b/js/stage/stage-deps.js
index 84f04249..0d53696b 100755
--- a/js/stage/stage-deps.js
+++ b/js/stage/stage-deps.js
@@ -105,7 +105,7 @@ exports.StageDeps = Montage.create(Component, {
 
             workingPlane = [0,0,1,0];
 
-            snapManager._isCacheInvalid = true;
+            snapManager.reload2DCache();
             snapManager.setupDragPlaneFromPlane (workingPlane);
 
             drawUtils.initializeFromDocument();
@@ -116,8 +116,9 @@ exports.StageDeps = Montage.create(Component, {
         value: function(){
             workingPlane = [0,0,1,0];
 
-            snapManager._isCacheInvalid = true;
             snapManager.setupDragPlaneFromPlane (workingPlane);
+            snapManager.reload2DCache();
+
 
             drawUtils.initializeFromDocument();
         }