Merge pull request #146 from mqg734/WebGLFileIO

Fixes for Line Tool and EyeDropper tool runtime error.

1 files changed, 2 insertions, 2 deletions

diff --git a/js/controllers/color-controller.js b/js/controllers/color-controller.js
index 8e000b19..c6d664cf 100755
--- a/js/controllers/color-controller.js
+++ b/js/controllers/color-controller.js
@@ -227,14 +227,14 @@ exports.ColorController = Montage.create(Component, {
                 //
                 this.fill = color;
                 //
-                if(e._event.wasSetByCode && mode !== 'nocolor') return;
+                if(e._event.wasSetByCode) return;
                 //
                 this.setColor(mode, color, true);
             } else if (input === 'stroke') {
                 //
                 this.stroke = color;
                 //
-                if(e._event.wasSetByCode && mode !== 'nocolor') return;
+                if(e._event.wasSetByCode) return;
 
                 this.setColor(mode, color, false);
             }