diff options
| author | Jose Antonio Marquez | 2012-02-08 13:14:29 -0800 |
|---|---|---|
| committer | Jose Antonio Marquez | 2012-02-08 13:14:29 -0800 |
| commit | 9b45b897949bf934c8bf2c90ee2ff78f8713cb12 (patch) | |
| tree | e7c276a3934c823cab894f46ee7dc5d3eda9ca83 /js/tools/ShapeTool.js | |
| parent | aa01c1210f3a4d9fd55a771b9de2c58ee3fa4bb6 (diff) | |
| parent | 10cdeb52403f16d5d4be43a516e8cdfbc866a2a2 (diff) | |
| download | ninja-9b45b897949bf934c8bf2c90ee2ff78f8713cb12.tar.gz | |
Merge branch 'refs/heads/NinjaInternal' into Color
Conflicts:
js/controllers/elements/shapes-controller.js
js/data/pi/pi-data.js
js/panels/properties/content.reel/content.js
Diffstat (limited to 'js/tools/ShapeTool.js')
| -rw-r--r-- | js/tools/ShapeTool.js | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/js/tools/ShapeTool.js b/js/tools/ShapeTool.js index 9a4399b4..4ccb7a8d 100644 --- a/js/tools/ShapeTool.js +++ b/js/tools/ShapeTool.js | |||
| @@ -83,6 +83,7 @@ exports.ShapeTool = Montage.create(DrawingTool, { | |||
| 83 | } | 83 | } |
| 84 | } | 84 | } |
| 85 | this.RenderShape(drawData.width, drawData.height, drawData.planeMat, drawData.midPt, canvas); | 85 | this.RenderShape(drawData.width, drawData.height, drawData.planeMat, drawData.midPt, canvas); |
| 86 | NJevent("elementAdded", canvas); | ||
| 86 | } | 87 | } |
| 87 | 88 | ||
| 88 | this.endDraw(event); | 89 | this.endDraw(event); |