aboutsummaryrefslogtreecommitdiff
path: root/js/ninja.reel
diff options
context:
space:
mode:
authorhwc4872012-05-17 11:06:20 -0700
committerhwc4872012-05-17 11:06:20 -0700
commit0a3c703ce285941da20167a6d04b13b7eced23be (patch)
treee87019bcc3356c58dc93d982af2cfe16b582974b /js/ninja.reel
parent1e649405d66f17d6acddb9055b181bba7ad70566 (diff)
parentc37a876b373ddc7cb19277aaeaa6bb2d2d5a50ac (diff)
downloadninja-0a3c703ce285941da20167a6d04b13b7eced23be.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
Diffstat (limited to 'js/ninja.reel')
-rwxr-xr-xjs/ninja.reel/ninja.js6
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();