aboutsummaryrefslogtreecommitdiff
path: root/js/components/layout
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-04-10 11:24:35 -0700
committerJose Antonio Marquez2012-04-10 11:24:35 -0700
commite663e336ee7e832b5059a82748061506b414cb04 (patch)
treea09d932319365067f437780e90aeab4ef19f74b4 /js/components/layout
parentc3022de5ba2e24737184dba7454233b165da0a20 (diff)
parentbd43ce383b050d03b0f92cc923c517febc66ca28 (diff)
downloadninja-e663e336ee7e832b5059a82748061506b414cb04.tar.gz
Merge branch 'refs/heads/Ninja-Internal' into Document
Diffstat (limited to 'js/components/layout')
-rwxr-xr-xjs/components/layout/tools-list.reel/tools-list.js1
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;