Merge branch 'refs/heads/ninja-internal' into PI_HotTextFixes

Conflicts:
	js/panels/properties.reel/sections/position-size.reel/position-size.html

Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>

1 files changed, 25 insertions, 0 deletions

diff --git a/js/components/tools-properties/fill-properties.reel/fill-properties.js b/js/components/tools-properties/fill-properties.reel/fill-properties.js
index 7331b375..ef1699af 100755
--- a/js/components/tools-properties/fill-properties.reel/fill-properties.js
+++ b/js/components/tools-properties/fill-properties.reel/fill-properties.js
@@ -10,6 +10,31 @@ var Montage = require("montage/core/core").Montage,
 
 var FillProperties = exports.FillProperties = Montage.create(ToolProperties, {
 
+    useFillColor: {
+        value: null,
+        serializable: true
+    },
+
+    _fillColorCtrl: {
+        value: null,
+        serializable: true
+    },
+
+    useWebGL: {
+        value: null,
+        serializable: true
+    },
+
+    _materialsContainer: {
+        value: null,
+        serializable: true
+    },
+
+    fillMaterial: {
+        value: null,
+        serializable: true
+    },
+
     addedColorChips: { value: false },
 
     _fill: {