Merge remote-tracking branch 'ninja-internal/master' into test-merge

Conflicts:
	js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
	js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
	js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js

1 files changed, 71 insertions, 0 deletions

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 },