Merge branch 'refs/heads/master' into AddAnimationsLibrary

Conflicts:
	js/panels/presets/default-transition-presets.js

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, {
                     temp = this.hslToRgb(color.h/360, color.s/100, color.l/100);
                 } else if (color.r !== undefined) {
                     temp = color;
+                } else if (color.gradientMode) {
+                    // TODO - Need to handle gradients at some point
+                    return null;
                 }
                 temp.a = color.a;
             }