diff options
author | Jon Reid | 2012-05-22 10:40:40 -0700 |
---|---|---|
committer | Jon Reid | 2012-05-22 10:40:40 -0700 |
commit | d43a3179171a9f82c7a17425ec69ff0a4d571f10 (patch) | |
tree | 1c78ccc588f04bac9bff4de82e527a128162cf4f /js/ninja.reel | |
parent | 1324301feea23f9d66c9ca2f52e004b552e9ed96 (diff) | |
parent | 0b6dfbbc7f6c0a67bd415ee8d64685b3f209edfa (diff) | |
download | ninja-d43a3179171a9f82c7a17425ec69ff0a4d571f10.tar.gz |
Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local
Diffstat (limited to 'js/ninja.reel')
-rwxr-xr-x | js/ninja.reel/ninja.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/js/ninja.reel/ninja.js b/js/ninja.reel/ninja.js index cf7c6cf4..1bdd0050 100755 --- a/js/ninja.reel/ninja.js +++ b/js/ninja.reel/ninja.js | |||
@@ -152,9 +152,9 @@ exports.Ninja = Montage.create(Component, { | |||
152 | 152 | ||
153 | this.application.ninja = this; | 153 | this.application.ninja = this; |
154 | 154 | ||
155 | this.toolsData.selectedTool = this.toolsData.defaultToolsData[0]; | 155 | this.toolsData.selectedTool = this.toolsData.defaultToolsData[this.application.ninja.toolsData.selectionToolIndex]; |
156 | this.toolsData.defaultSubToolsData = this.toolsData.defaultToolsData[7].subtools; | 156 | this.toolsData.defaultSubToolsData = this.toolsData.defaultToolsData[this.application.ninja.toolsData.shapeToolIndex].subtools; |
157 | this.toolsData.selectedSubTool = this.toolsData.defaultToolsData[7].subtools[1]; | 157 | this.toolsData.selectedSubTool = this.toolsData.defaultToolsData[this.application.ninja.toolsData.shapeToolIndex].subtools[1]; |
158 | this.toolsData.selectedToolInstance = this.toolsList[this.toolsData.selectedTool.action]; | 158 | this.toolsData.selectedToolInstance = this.toolsList[this.toolsData.selectedTool.action]; |
159 | 159 | ||
160 | this.setupGlobalHelpers(); | 160 | this.setupGlobalHelpers(); |