Merge branch 'refs/heads/master' into montage-v10-integration

Conflicts:
	js/io/system/ninjalibrary.json
	js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js

Signed-off-by: Valerio Virgillito <valerio@motorola.com>

1 files changed, 3 insertions, 0 deletions

diff --git a/js/tools/drawing-tool.js b/js/tools/drawing-tool.js
index d906fdf9..9ba4501c 100755
--- a/js/tools/drawing-tool.js
+++ b/js/tools/drawing-tool.js
@@ -64,6 +64,8 @@ exports.DrawingTool = Montage.create(ToolBase, {
         set: function (value) { this._currentY = value; }
     },
 
+    drawData: { value: null },
+
     /**
     * PUBLIC METHODS
     */
@@ -74,6 +76,7 @@ exports.DrawingTool = Montage.create(ToolBase, {
             this._isDrawing = true;
             this.mouseDownHitRec = null;
             this.mouseUpHitRec = null;
+            this.drawData = null;
 
             point = webkitConvertPointFromPageToNode(this.application.ninja.stage.canvas, new WebKitPoint(event.pageX, event.pageY));
             snapData = DrawingToolBase.getInitialSnapPoint(point.x, point.y, this._targetedElement); //event.layerX, event.layerY);