4 files changed, 37 insertions, 21 deletions

diff --git a/js/controllers/elements/shapes-controller.js b/js/controllers/elements/shapes-controller.js
index 14cdc473..a446ef05 100755
--- a/js/controllers/elements/shapes-controller.js
+++ b/js/controllers/elements/shapes-controller.js
@@ -399,8 +399,8 @@ exports.ShapesController = Montage.create(CanvasController, {
             if(isFill)
             {
                 // Properties Panel asks for fill color even for shapes that only have strokes
-                // Check that shape object has a getFillColor method before getting fills
-                if(el.elementModel.shapeModel.GLGeomObj.getFillColor)
+                // Check that shape object supports fills
+                if(el.elementModel.shapeModel.GLGeomObj.canFill)
                 {
                     return this.application.ninja.colorController.colorModel.webGlToColor(el.elementModel.shapeModel.GLGeomObj.getFillColor());
                 }
@@ -497,28 +497,36 @@ exports.ShapesController = Montage.create(CanvasController, {
                 webGl;
             if(isFill)
             {
-                if(mode)
+                // skip shape types that don't have fill color
+                if(el.elementModel.shapeModel.GLGeomObj.canFill)
                 {
-                    switch (mode) {
-                        case 'nocolor':
-                            el.elementModel.shapeModel.GLGeomObj.setFillColor(null);
-                            break;
-                        case 'gradient':
-                            if(el.elementModel.shapeModel.useWebGl)
-                            {
-                                this._setGradientMaterial(el, color.color.gradientMode, isFill);
-                            }
-                            el.elementModel.shapeModel.GLGeomObj.setFillColor({gradientMode:color.color.gradientMode, color:color.color.stops});
-                            break;
-                        default:
-                            if(el.elementModel.shapeModel.useWebGl)
-                            {
-                                this._setFlatMaterial(el, isFill);
-                            }
-                            webGl = this.application.ninja.colorController.colorModel.colorToWebGl(color.color);
-                            el.elementModel.shapeModel.GLGeomObj.setFillColor(webGl);
+                    if(mode)
+                    {
+                        switch (mode) {
+                            case 'nocolor':
+                                el.elementModel.shapeModel.GLGeomObj.setFillColor(null);
+                                break;
+                            case 'gradient':
+                                if(el.elementModel.shapeModel.useWebGl)
+                                {
+                                    this._setGradientMaterial(el, color.color.gradientMode, isFill);
+                                }
+                                el.elementModel.shapeModel.GLGeomObj.setFillColor({gradientMode:color.color.gradientMode, color:color.color.stops});
+                                break;
+                            default:
+                                if(el.elementModel.shapeModel.useWebGl)
+                                {
+                                    this._setFlatMaterial(el, isFill);
+                                }
+                                webGl = this.application.ninja.colorController.colorModel.colorToWebGl(color.color);
+                                el.elementModel.shapeModel.GLGeomObj.setFillColor(webGl);
+                        }
                     }
                 }
+                else
+                {
+                    return;
+                }
             }
             else
             {
diff --git a/js/lib/geom/brush-stroke.js b/js/lib/geom/brush-stroke.js
index 26ac42e9..743dab85 100755
--- a/js/lib/geom/brush-stroke.js
+++ b/js/lib/geom/brush-stroke.js
@@ -44,6 +44,9 @@ var BrushStroke = function GLBrushStroke() {
     this._strokeAngle = 0;
     this._strokeAmountSmoothing = 0;
 
+    // currently, brush does not support a fill region
+    this.canFill = false;
+
     //threshold that tells us whether two samples are too far apart
     this._MAX_SAMPLE_DISTANCE_THRESHOLD = 5;
 
diff --git a/js/lib/geom/geom-obj.js b/js/lib/geom/geom-obj.js
index 2cde8a75..f2991bdb 100755
--- a/js/lib/geom/geom-obj.js
+++ b/js/lib/geom/geom-obj.js
@@ -47,6 +47,9 @@ var GeomObj = function GLGeomObj() {
     this._fillMaterial = null;
     this._strokeMaterial = null;
 
+    // Shapes (such as lines) that don't support fill should set this to false
+    this.canFill = true;
+
     // array of primitives - used in RDGE
     this._primArray = [];
     this._materialNodeArray = [];
diff --git a/js/lib/geom/line.js b/js/lib/geom/line.js
index 8ee39098..bb198d83 100755
--- a/js/lib/geom/line.js
+++ b/js/lib/geom/line.js
@@ -33,6 +33,8 @@ var Line = function GLLine( world, xOffset, yOffset, width, height, slope, strok
         this._scaleX = 1.0;
         this._scaleY = 1.0;
 
+    this.canFill = false;
+
         if (arguments.length > 0) {
                 this._width = width;
                 this._height = height;