diff options
| author | Jose Antonio Marquez | 2012-04-10 11:24:21 -0700 |
|---|---|---|
| committer | Jose Antonio Marquez | 2012-04-10 11:24:21 -0700 |
| commit | d14f78b06d37aa469885f2ecf84419bcb7e3e613 (patch) | |
| tree | 91b95c6c9aef779a743b710105546a8ae74bff12 /js/components/layout/tools-list.reel | |
| parent | a9bcc403df76ad2cb7c31ff7fdd42a85c35cf424 (diff) | |
| parent | bd43ce383b050d03b0f92cc923c517febc66ca28 (diff) | |
| download | ninja-d14f78b06d37aa469885f2ecf84419bcb7e3e613.tar.gz | |
Merge branch 'refs/heads/Ninja-Internal' into FileIO
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; |