diff options
| author | Nivesh Rajbhandari | 2012-06-19 15:56:23 -0700 |
|---|---|---|
| committer | Nivesh Rajbhandari | 2012-06-19 15:56:23 -0700 |
| commit | 3ed06c2a55b1ae840334efeb47f7743944ecb3ca (patch) | |
| tree | 0ad3e94248a1d4828386c8743a670c709357a470 /js/tools/EyedropperTool.js | |
| parent | a0d18963d746e410511c29edd32bc1775d2d5851 (diff) | |
| parent | 483ad57efcd6475776f580c3af5b60e6deeaf781 (diff) | |
| download | ninja-3ed06c2a55b1ae840334efeb47f7743944ecb3ca.tar.gz | |
Merge branch 'refs/heads/ninja-internal' into GIO_Fixes
Diffstat (limited to 'js/tools/EyedropperTool.js')
| -rwxr-xr-x | js/tools/EyedropperTool.js | 2 |
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"; |