Merge branch 'refs/heads/NinjaInternal' into Color

Conflicts:
	js/controllers/elements/shapes-controller.js
	js/data/pi/pi-data.js
	js/panels/properties/content.reel/content.js

1 files changed, 1 insertions, 2 deletions

diff --git a/js/models/shape-model.js b/js/models/shape-model.js
index b643a7b5..58a88fd0 100644
--- a/js/models/shape-model.js
+++ b/js/models/shape-model.js
@@ -10,6 +10,7 @@ var Montage = require("montage/core/core").Montage,
 exports.ShapeModel = Montage.create(Component, {
 
     shapeCount:             { value: 0 },
+    useWebGl:           { value: false },
 
     GLWorld:                { value: null },
     GLGeomObj:              { value: null },
@@ -17,14 +18,12 @@ exports.ShapeModel = Montage.create(Component, {
     strokeSize:             { value: null },
     stroke:                 { value: null },
     strokeMaterial:         { value: null },
-    strokeMaterialIndex:    { value: null },
     strokeStyle:            { value: null },
     strokeStyleIndex:       { value: null },
     border:                 { value: null },    // Store css value for ColorController
 
     fill:                   { value: null },
     fillMaterial:           { value: null },
-    fillMaterialIndex:      { value: null },
     background:             { value: null },    // Store css value for ColorController
 
     // Line-specific