Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local

Conflicts:
	js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
	Resolution: Use both.

2 files changed, 4 insertions, 1 deletions

diff --git a/js/stage/layout.js b/js/stage/layout.js
index 28484b71..99c3a403 100755
--- a/js/stage/layout.js
+++ b/js/stage/layout.js
@@ -46,6 +46,9 @@ exports.Layout = Montage.create(Component, {
                 return;
             }
 
+            drawUtils._eltArray.length = 0;
+            drawUtils._planesArray.length = 0;
+
             this._currentDocument = value;
 
             if(!value) {
diff --git a/js/stage/stage.reel/stage.js b/js/stage/stage.reel/stage.js
index fce73882..f4de3070 100755
--- a/js/stage/stage.reel/stage.js
+++ b/js/stage/stage.reel/stage.js
@@ -705,7 +705,7 @@ exports.Stage = Montage.create(Component, {
             point = webkitConvertPointFromPageToNode(this.canvas, new WebKitPoint(position.pageX - docView.iframe.contentWindow.pageXOffset + this.documentOffsetLeft, position.pageY - docView.iframe.contentWindow.pageYOffset + this.documentOffsetTop));
             element = this.currentDocument.model.views.design.getElementFromPoint(point.x - this.userContentLeft,point.y - this.userContentTop);
 
-            if(!element) debugger;
+//            if(!element) debugger;
             // workaround Chrome 3d bug
             if(this.application.ninja.toolsData.selectedToolInstance._canSnap && this.currentDocument.inExclusion(element) !== -1) {
                 point = webkitConvertPointFromPageToNode(this.canvas, new WebKitPoint(position.pageX, position.pageY));