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>

17 files changed, 407 insertions, 72 deletions

diff --git a/js/components/tools-properties/brush-properties.reel/brush-properties.js b/js/components/tools-properties/brush-properties.reel/brush-properties.js
index 7a0d21f1..1af128af 100755
--- a/js/components/tools-properties/brush-properties.reel/brush-properties.js
+++ b/js/components/tools-properties/brush-properties.reel/brush-properties.js
@@ -11,6 +11,46 @@ var ToolProperties = require("js/components/tools-properties/tool-properties").T
 var BrushProperties = exports.BrushProperties = Montage.create(ToolProperties, {
     addedColorChips: { value: false },
 
+    _fillColorCtrl: {
+        value: null,
+        serializable: true
+    },
+
+    _strokeSize: {
+        value: null,
+        serializable: true
+    },
+
+    _strokeHardness: {
+        value: null,
+        serializable: true
+    },
+
+    _doSmoothing: {
+        value: null,
+        serializable: true
+    },
+
+    _smoothingAmount: {
+        value: null,
+        serializable: true
+    },
+
+    _useCalligraphic: {
+        value: null,
+        serializable: true
+    },
+
+    _strokeAngle: {
+        value: null,
+        serializable: true
+    },
+
+    _angleLabel: {
+        value: null,
+        serializable: true
+    },
+
     _fill: {
         enumerable: false,
         value: { colorMode: 'rgb', color: { r: 0, g: 0, b: 0, a: 1, css: 'rgb(0,0,0)', mode: 'rgb', wasSetByCode: true, type: 'change' }, webGlColor: [0, 0, 0, 1] }
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: {
diff --git a/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.js b/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.js
index 7affe581..25823d11 100755
--- a/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.js
+++ b/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.js
@@ -11,6 +11,71 @@ var Montage = require("montage/core/core").Montage,
 var InkBottleProperties = exports.InkBottleProperties = Montage.create(ToolProperties, {
     addedColorChips: { value: false },
 
+    useStrokeColor: {
+        value: null,
+        serializable: true
+    },
+
+    _strokeColorCtrl: {
+        value: null,
+        serializable: true
+    },
+
+    borderWidth: {
+        value: null,
+        serializable: true
+    },
+
+    useBorderWidth: {
+        value: null,
+        serializable: true
+    },
+
+    useBorderStyle: {
+        value: null,
+        serializable: true
+    },
+
+    borderStyle: {
+        value: null,
+        serializable: true
+    },
+
+    useStrokeSize: {
+        value: null,
+        serializable: true
+    },
+
+    strokeSize: {
+        value: null,
+        serializable: true
+    },
+
+    _useWebGL: {
+        value: null,
+        serializable: true
+    },
+
+    useWebGL: {
+        value: null,
+        serializable: true
+    },
+
+    _materialsContainer: {
+        value: null,
+        serializable: true
+    },
+
+    _strokeMaterial: {
+        value: null,
+        serializable: true
+    },
+
+    strokeMaterial: {
+        value: null,
+        serializable: true
+    },
+
     _stroke: {
         enumerable: false,
         value: { colorMode: 'rgb', color: { r: 255, g: 255, b: 255, a: 1, css: 'rgb(255,255,255)', mode: 'rgb', wasSetByCode: true, type: 'change' }, webGlColor: [1, 1, 1, 1] }
diff --git a/js/components/tools-properties/line-properties.reel/line-properties.js b/js/components/tools-properties/line-properties.reel/line-properties.js
index ce8c0494..8c845432 100755
--- a/js/components/tools-properties/line-properties.reel/line-properties.js
+++ b/js/components/tools-properties/line-properties.reel/line-properties.js
@@ -9,7 +9,10 @@ var Montage = require("montage/core/core").Montage,
 
 exports.LineProperties = Montage.create(ToolProperties, {
 
-    base:       { value: null },
+    base: {
+        value: null,