diff options
| author | Eric Guzman | 2012-04-09 15:44:09 -0700 |
|---|---|---|
| committer | Eric Guzman | 2012-04-09 15:44:09 -0700 |
| commit | a27915e900eb768dd9db1f0dd441961ea80bfaa6 (patch) | |
| tree | 593f429f0b3294103a059ae9f6ed03858288deb7 /js/components/layout/tools-list.reel | |
| parent | afcaa157f7bc067cf00de91b43b2a71e9b64b7b3 (diff) | |
| parent | bd43ce383b050d03b0f92cc923c517febc66ca28 (diff) | |
| download | ninja-a27915e900eb768dd9db1f0dd441961ea80bfaa6.tar.gz | |
Merge branch 'refs/heads/master' into CSSPanelUpdates
Diffstat (limited to 'js/components/layout/tools-list.reel')
| -rwxr-xr-x | js/components/layout/tools-list.reel/tools-list.js | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/js/components/layout/tools-list.reel/tools-list.js b/js/components/layout/tools-list.reel/tools-list.js index 5ea6f70f..d68e8a56 100755 --- a/js/components/layout/tools-list.reel/tools-list.js +++ b/js/components/layout/tools-list.reel/tools-list.js | |||
| @@ -56,6 +56,7 @@ exports.ToolsList = Montage.create(Component, { | |||
| 56 | this.SubselectionTool.options = this.application.ninja.toolsProperties.subSelectionProperties; | 56 | this.SubselectionTool.options = this.application.ninja.toolsProperties.subSelectionProperties; |
| 57 | 57 | ||
| 58 | this.Rotate3DTool.options = this.application.ninja.toolsProperties.rotate3DProperties; | 58 | this.Rotate3DTool.options = this.application.ninja.toolsProperties.rotate3DProperties; |
| 59 | this.Translate3DTool.options = this.application.ninja.toolsProperties.rotate3DProperties; | ||
| 59 | this.TagTool.options = this.application.ninja.toolsProperties.tagProperties; | 60 | this.TagTool.options = this.application.ninja.toolsProperties.tagProperties; |
| 60 | this.PenTool.options = this.application.ninja.toolsProperties.penProperties; | 61 | this.PenTool.options = this.application.ninja.toolsProperties.penProperties; |
| 61 | this.TextTool.options = this.application.ninja.toolsProperties.textProperties; | 62 | this.TextTool.options = this.application.ninja.toolsProperties.textProperties; |