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, 1 insertions, 1 deletions

diff --git a/js/tools/Rotate3DToolBase.js b/js/tools/Rotate3DToolBase.js
index bf9537dd..f0fe83fa 100755
--- a/js/tools/Rotate3DToolBase.js
+++ b/js/tools/Rotate3DToolBase.js
@@ -98,7 +98,7 @@ exports.Rotate3DToolBase = Montage.create(ModifierToolBase, {
 //                    {
 //                        hitRec = snapManager.findHitRecordForElement(elt);
 //                    }
-//                    if(elt === this.application.ninja.currentSelectedContainer)
+//                    if(elt === this.application.ninja.currentDocument.model.domContainer)
 //                    {
 //                        this._clickedOnStage = true;
 //                    }