Merge branch 'master' into pentool

Conflicts:
	js/helper-classes/3D/view-utils.js

1 files changed, 3 insertions, 0 deletions

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 = [];