4 files changed, 19 insertions, 14 deletions

diff --git a/js/controllers/styles-controller.js b/js/controllers/styles-controller.js
index 863348cd..83722184 100755
--- a/js/controllers/styles-controller.js
+++ b/js/controllers/styles-controller.js
@@ -160,10 +160,6 @@ var stylesController = exports.StylesController = Montage.create(Component, {
                 this.setStyles(rule, styles);
                 this.addClass(this.currentDocument.model.documentRoot, "ninja-body");
             }
-
-            //TODO - Temporarily moving this here so we guarantee the StylesController has a chance
-            // to initialize the stage's styles prior to doing any styles lookup.
-            this.application.ninja.stage.snapManager.setupDragPlaneFromPlane (workingPlane);
         }
     },
     /* ----------------- Rule methods ----------------- */
diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html
index 0c0944e7..33c3080f 100755
--- a/js/ninja.reel/ninja.html
+++ b/js/ninja.reel/ninja.html
@@ -150,6 +150,13 @@
                 ]
             },
 
+            "stylesController": {
+                "prototype": "js/controllers/styles-controller",
+                "bindings": {
+                    "currentDocument": {"<-": "@documentList.selectedObjects.0"}
+                }
+            },
+
             "stageMode": {
                 "prototype": "js/components/layout/stage-mode.reel",
                 "properties": {
@@ -318,13 +325,6 @@
                 "prototype": "js/controllers/color-controller"
             },
 
-            "stylesController": {
-                "prototype": "js/controllers/styles-controller",
-                "bindings": {
-                    "currentDocument": {"<-": "@documentList.selectedObjects.0"}
-                }
-            },
-
             "presetsController": {
                 "prototype": "js/controllers/presets-controller"
             },
diff --git a/js/stage/stage.reel/stage.js b/js/stage/stage.reel/stage.js
index 4d9296a1..d8f7313b 100755
--- a/js/stage/stage.reel/stage.js
+++ b/js/stage/stage.reel/stage.js
@@ -1090,9 +1090,7 @@ exports.Stage = Montage.create(Component, {
 
             this.snapManager._isCacheInvalid = true;
             this.snapManager.currentStage = this.currentDocument.model.documentRoot;
-                        //TODO - StylesController needs to initialize the stage's styles prior to calling this.
-            // So, moving this into styles-controller.initializeRootStyles code.
-//            this.snapManager.setupDragPlaneFromPlane (workingPlane);
+            this.snapManager.setupDragPlaneFromPlane (workingPlane);
 
             this.drawUtils.initializeFromDocument();
         }
diff --git a/js/tools/RotateStage3DTool.js b/js/tools/RotateStage3DTool.js
index 12b21a64..9e117837 100755
--- a/js/tools/RotateStage3DTool.js
+++ b/js/tools/RotateStage3DTool.js
@@ -85,6 +85,12 @@ exports.RotateStage3DTool = Montage.create(Rotate3DToolBase, {
         }
     },
 
+    captureSelectionChange: {
+        value: function(event){
+            this.eventManager.addEventListener("selectionDrawn", this, true);
+        }
+    },
+
     captureSelectionDrawn: {
         value: function(event){
             this._origin = null;
@@ -114,6 +120,11 @@ exports.RotateStage3DTool = Montage.create(Rotate3DToolBase, {
             this._origin = viewUtils.localToGlobal(eltCtr, stage);
             this._setTransformOrigin(false);
             this.DrawHandles();
+
+            if(event)
+            {
+                this.eventManager.removeEventListener("selectionDrawn", this, true);
+            }
         }
     },