diff options
author | Pushkar Joshi | 2012-03-13 11:36:11 -0700 |
---|---|---|
committer | Pushkar Joshi | 2012-03-13 11:36:11 -0700 |
commit | 6023f7c8258e660388ee33730601f1161f9299e9 (patch) | |
tree | 632484428b398f71b8481aa8e30180895ff2483c /js/models/color-model.js | |
parent | 76f2021618c0a6a99a1b855233e353e84ca99467 (diff) | |
parent | 4ad1650f629e7e345eade52ed6dadc233b27cc45 (diff) | |
download | ninja-6023f7c8258e660388ee33730601f1161f9299e9.tar.gz |
Merge branch 'pentool' into brushtool
Diffstat (limited to 'js/models/color-model.js')
-rwxr-xr-x | js/models/color-model.js | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/js/models/color-model.js b/js/models/color-model.js index 2c86422f..4189fbef 100755 --- a/js/models/color-model.js +++ b/js/models/color-model.js | |||
@@ -574,6 +574,9 @@ exports.ColorModel = Montage.create(Component, { | |||
574 | temp = this.hslToRgb(color.h/360, color.s/100, color.l/100); | 574 | temp = this.hslToRgb(color.h/360, color.s/100, color.l/100); |
575 | } else if (color.r !== undefined) { | 575 | } else if (color.r !== undefined) { |
576 | temp = color; | 576 | temp = color; |
577 | } else if (color.gradientMode) { | ||
578 | // TODO - Need to handle gradients at some point | ||
579 | return null; | ||
577 | } | 580 | } |
578 | temp.a = color.a; | 581 | temp.a = color.a; |
579 | } | 582 | } |