aboutsummaryrefslogtreecommitdiff
path: root/js/tools/EyedropperTool.js
diff options
context:
space:
mode:
authorEric Guzman2012-06-19 01:20:36 -0700
committerEric Guzman2012-06-19 01:20:36 -0700
commit2ef72cdf0e59fb3623a2c13251ac707522f3dc5a (patch)
treef69f4e3de7e4441311ef2b38770e0ce26067aac4 /js/tools/EyedropperTool.js
parent5260d3dfd99d79924c4aaa3ab798e90c7d328d7d (diff)
parent1007cbf983ad0f2460a4122a492a96023fdb4439 (diff)
downloadninja-2ef72cdf0e59fb3623a2c13251ac707522f3dc5a.tar.gz
Merge branch 'binding' of github.com:dhg637/ninja-internal into binding
Conflicts: js/stage/binding-view.reel/binding-view.js
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";