diff options
| author | Valerio Virgillito | 2012-06-18 22:22:57 -0700 |
|---|---|---|
| committer | Valerio Virgillito | 2012-06-18 22:22:57 -0700 |
| commit | 795a6908ccac21b773490954371f2c4def9e5379 (patch) | |
| tree | 68db12b1fc96286cc8ff78034c7b155df71f9ef3 /js/tools | |
| parent | ad6f78493295c9c7b4c11cd6a895dd5cc8e207f7 (diff) | |
| parent | 918a4f5870e972b6e4e301c3237e065a1ffd26f5 (diff) | |
| download | ninja-795a6908ccac21b773490954371f2c4def9e5379.tar.gz | |
Merge branch 'refs/heads/master' into montage-v11-integration
Diffstat (limited to 'js/tools')
| -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"; |