aboutsummaryrefslogtreecommitdiff
path: root/js/components/layout
diff options
context:
space:
mode:
authorJon Reid2012-04-10 14:52:23 -0700
committerJon Reid2012-04-10 14:52:23 -0700
commitc19987997758cf47ac9b93a2a767a0e2a9072745 (patch)
treeeb68491c5d04a5cf5ab75bedf2d6bbed3c7a3603 /js/components/layout
parent03a3b32b9b0fd2dc8e4b54bfd5282fd1f8fb6ed6 (diff)
parent422b14fc60be84c116115f2e71e3499e232f3f05 (diff)
downloadninja-c19987997758cf47ac9b93a2a767a0e2a9072745.tar.gz
Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local
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;