Merge branch 'refs/heads/TimelineUberjd' into TimelineUber

Conflicts:
	js/controllers/elements/element-controller.js
	js/document/_toDelete/html-document.js
	js/panels/Timeline/Layer.reel/Layer.js

Signed-off-by: Kruti Shah <kruti.shah@motorola.com>

1 files changed, 1 insertions, 1 deletions

diff --git a/js/tools/drawing-tool-base.js b/js/tools/drawing-tool-base.js
index 3549de1c..a752ad65 100755
--- a/js/tools/drawing-tool-base.js
+++ b/js/tools/drawing-tool-base.js
@@ -86,7 +86,7 @@ exports.DrawingToolBase = Montage.create(Component, {
 //                    return null;
 //                }
                 if(downHitRec) {
-                    hitRec = hitRec.convertToWorkingPlane(this.dragPlane);
+                    hitRec = hitRec.convertToWorkingPlane(this.dragPlane || downHitRec.getPlane());
                 } else if ((hitRec.getType() !== hitRec.SNAP_TYPE_STAGE) && !hitRec.isSomeGridTypeSnap()) {
                     hitRec = hitRec.convertToWorkingPlane( snapManager.getDragPlane() );
                 }