aboutsummaryrefslogtreecommitdiff
path: root/js/tools/EyedropperTool.js
diff options
context:
space:
mode:
authorJonathan Duran2012-06-19 08:40:26 -0700
committerJonathan Duran2012-06-19 08:40:26 -0700
commit6f25a2e70079de6bcbb8c3411ddef88c2ed1ea39 (patch)
tree253e5f6dd5923218e3155f78fa67ff3e43de0ebc /js/tools/EyedropperTool.js
parentb51c9448bc187f9bfa3ab39c366657ec2bb9e2fb (diff)
parent483ad57efcd6475776f580c3af5b60e6deeaf781 (diff)
downloadninja-6f25a2e70079de6bcbb8c3411ddef88c2ed1ea39.tar.gz
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Diffstat (limited to 'js/tools/EyedropperTool.js')
-rwxr-xr-xjs/tools/EyedropperTool.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/js/tools/EyedropperTool.js b/js/tools/EyedropperTool.js
index 6a56004d..30a6a48b 100755
--- a/js/tools/EyedropperTool.js
+++ b/js/tools/EyedropperTool.js
@@ -240,7 +240,7 @@ exports.EyedropperTool = Montage.create(toolBase, {
240 else 240 else
241 { 241 {
242 this.application.ninja.colorController.colorModel.alpha = {value: 1, wasSetByCode: true, type: eventType}; 242 this.application.ninja.colorController.colorModel.alpha = {value: 1, wasSetByCode: true, type: eventType};
243 this.application.ninja.colorController.colorModel.applyNoColor(); 243 this.application.ninja.colorController.colorModel.applyNoColor(true);
244 if(updateColorToolBar) 244 if(updateColorToolBar)
245 { 245 {
246 this._previousColor = "none"; 246 this._previousColor = "none";