Merge branch 'refs/heads/NinjaInternal' into FileIO

1 files changed, 2 insertions, 0 deletions

diff --git a/js/models/shape-model.js b/js/models/shape-model.js
index 9d4fff6f..b643a7b5 100755
--- a/js/models/shape-model.js
+++ b/js/models/shape-model.js
@@ -20,10 +20,12 @@ exports.ShapeModel = Montage.create(Component, {
     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
     slope:                  { value: null },