aboutsummaryrefslogtreecommitdiff
path: root/js/lib/geom/geom-obj.js
diff options
context:
space:
mode:
authorJonathan Duran2012-04-18 08:08:14 -0700
committerJonathan Duran2012-04-18 08:08:14 -0700
commit9f05148454783fd761c9cad35a169c6cb164c1a4 (patch)
tree02b9cac67ce4215443beab9f47fa4cf216e77840 /js/lib/geom/geom-obj.js
parenta2af3c8bd2349a24dd7de920381b04847a863a46 (diff)
parent616a8532099fec2a15855eac97cd85cb60c4451c (diff)
downloadninja-9f05148454783fd761c9cad35a169c6cb164c1a4.tar.gz
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Diffstat (limited to 'js/lib/geom/geom-obj.js')
-rwxr-xr-xjs/lib/geom/geom-obj.js3
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() {
47 this._fillMaterial = null; 47 this._fillMaterial = null;
48 this._strokeMaterial = null; 48 this._strokeMaterial = null;
49 49
50 // Shapes (such as lines) that don't support fill should set this to false
51 this.canFill = true;
52
50 // array of primitives - used in RDGE 53 // array of primitives - used in RDGE
51 this._primArray = []; 54 this._primArray = [];
52 this._materialNodeArray = []; 55 this._materialNodeArray = [];