Merge branch 'refs/heads/Ninja-Internal' into Color

2 files changed, 72 insertions, 6 deletions

diff --git a/js/components/tools-properties/shape-properties.reel/shape-properties.html b/js/components/tools-properties/shape-properties.reel/shape-properties.html
index 9b523a3f..ea246ea8 100755
--- a/js/components/tools-properties/shape-properties.reel/shape-properties.html
+++ b/js/components/tools-properties/shape-properties.reel/shape-properties.html
@@ -118,12 +118,7 @@
                     "rectProperties": {"@": "rectProperties1"},
                     "lineProperties": {"@": "lineProperties1"},
 
-                    "endDivider": {"#": "endDivider"},
-
-                    "components": [
-                        {"@": "repetition1"}
-                    ]
-
+                    "endDivider": {"#": "endDivider"}
                 }
 
             }
diff --git a/js/components/tools-properties/shape-properties.reel/shape-properties.js b/js/components/tools-properties/shape-properties.reel/shape-properties.js
index bd0cf8cf..5829634c 100755
--- a/js/components/tools-properties/shape-properties.reel/shape-properties.js
+++ b/js/components/tools-properties/shape-properties.reel/shape-properties.js
@@ -10,6 +10,77 @@ var Montage = require("montage/core/core").Montage,
 
 var ShapeProperties = exports.ShapeProperties = Montage.create(ToolProperties, {
     toolsData: { value: null },
+
+    _strokeMaterial: {
+        value: null,
+        serializable: true
+    },
+
+    _fillIcon: {
+        value: null,
+        serializable: true
+    },
+
+    _fillMaterial: {
+        value: null,
+        serializable: true
+    },
+
+    _useWebGL: {
+        value: null,
+        serializable: true
+    },
+
+    _materialLabel: {
+        value: null,
+        serializable: true
+    },
+
+    _strokeIcon: {
+        value: null,
+        serializable: true
+    },
+
+    _fillColorCtrlIcon: {
+        value: null,
+        serializable: true
+    },
+
+    _fillColorCtrl: {
+        value: null,
+        serializable: true
+    },
+
+    _strokeColorCtrl: {
+        value: null,
+        serializable: true
+    },
+
+    _strokeSize: {
+        value: null,
+        serializable: true
+    },
+
+    ovalProperties: {
+        value: null,
+        serializable: true
+    },
+
+    rectProperties: {
+        value: null,
+        serializable: true
+    },
+
+    lineProperties: {
+        value: null,
+        serializable: true
+    },
+
+    endDivider: {
+        value: null,
+        serializable: true
+    },
+
     _use3D: { value: false },
     addedColorChips: { value: false },