Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures

Conflicts:
	js/lib/drawing/world.js
	js/lib/geom/geom-obj.js
	js/lib/rdge/materials/cloud-material.js
	js/lib/rdge/materials/deform-material.js
	js/lib/rdge/materials/flat-material.js
	js/lib/rdge/materials/material.js
	js/lib/rdge/materials/pulse-material.js
	js/lib/rdge/materials/relief-tunnel-material.js
	js/lib/rdge/materials/square-tunnel-material.js
	js/lib/rdge/materials/star-material.js
	js/lib/rdge/materials/taper-material.js
	js/lib/rdge/materials/tunnel-material.js
	js/lib/rdge/materials/twist-material.js
	js/lib/rdge/materials/twist-vert-material.js
	js/lib/rdge/materials/uber-material.js
	js/lib/rdge/materials/water-material.js
	js/lib/rdge/materials/z-invert-material.js

1 files changed, 143 insertions, 2 deletions

diff --git a/js/data/pi/pi-data.js b/js/data/pi/pi-data.js
index 52360302..157c54ec 100755
--- a/js/data/pi/pi-data.js
+++ b/js/data/pi/pi-data.js
@@ -131,6 +131,8 @@ exports.PiData = Montage.create( Montage, {
                             type : "hottext",
                             id : "borderWidth",
                             prop : "border-width",
+                            defaultValue: 0,
+                            valueMutator: parseFloat,
                             label : "Border",
                             min :   0,
                             max :   100,
@@ -578,7 +580,7 @@ exports.PiData = Montage.create( Montage, {
                             valueMutator: parseFloat,
                             value : 0,
                             min :   0,
-                            max :   100,
+                            max :   99,
                             unit : "%",
                             acceptableUnits: ["%"]
 
@@ -653,7 +655,146 @@ exports.PiData = Montage.create( Montage, {
                 ]
             }
         ]
-    }
+    },
+    SubpathPi: {
+        value: [
+            {
+                label: "Stroke",
+
+                Section: [
+                    [
+                        {
+                            type : "color",
+                            prop: "border",
+                            id : "stroke"
+                        },
+                        {
+                            type : "color",
+                            id : "fill",
+                            prop: "background",
+                            divider : true
+                        }
+                    ],
+                    [
+                        {
+                            type : "hottext",
+                            id : "strokeSize",
+                            prop : "strokeSize",
+                            label : "Stroke",
+                            valueMutator: parseFloat,
+                            min :   1,
+                            max :   100,
+                            value : 1,
+                            unit : "px",
+                            acceptableUnits: ["pt", "px"]
+                        }
+                    ]
+                ]
+            }
+        ]
+    },
+    BrushStrokePi: {
+        value: [
+            {
+                label: "Stroke",
+
+                Section: [
+                    [
+                        {
+                            type : "color",
+                            prop: "border",
+                            id : "stroke"
+                        },
+                        {
+                            type : "color",
+                            id : "fill",
+                            prop: "background",
+                            visible : false,
+                            divider : true
+                        }
+                    ],
+                    [
+                        {
+                            type : "hottext",
+                            id : "strokeSize",
+                            prop : "strokeSize",
+                            label : "Stroke",
+                            valueMutator: parseInt,
+                            min :   1,
+                            max :   100,
+                            value : 1,
+                            unit : "px",
+                            acceptableUnits: ["pt", "px"]
+                        },
+                        {
+                            type : "hottext",
+                            id : "strokeHardness",
+                            prop : "strokeHardness",
+                            label : "Hardness",
+                            valueMutator: parseInt,
+                            min :   0,
+                            max :   100,
+                            value : 100,
+                            unit : "%",
+                            acceptableUnits: ["%"]
+                        }
+                    ]
+                ]
+            },
+            {
+                label: "Smoothing",
+                Section: [
+                    [
+                        {
+                            type: "checkbox",
+                            id: "doSmoothing",
+                            prop: "doSmoothing",
+                            defaultValue: false,
+                            value: "Y/N",
+                            checked: false
+                        },
+                        {
+                            type : "hottext",
+                            id : "strokeSmoothing",
+                            prop : "strokeSmoothing",
+                            label : "Amount",
+                            valueMutator: parseFloat,
+                            min :   0,
+                            max :   100,
+                            value : 0
+                        }
+                    ]
+                ]
+            },
+            {
+                label: "Calligraphic",
+                Section: [
+                    [
+                        {
+                            type: "checkbox",
+                            id: "isCalligraphic",
+                            prop: "isCalligraphic",
+                            defaultValue: false,
+                            value: "Y/N",
+                            checked: false,
+                            divider : true
+                        },
+                        {
+                            type : "hottext",
+                            id : "strokeAngle",
+                            prop : "strokeAngle",
+                            label : "Angle",
+                            valueMutator: parseFloat,
+                            min :   -90,
+                            max :   90,
+                            value : 0,
+                            unit : "deg."
+                        }
+                    ]
+                ]
+            }
+        ] //value: [
+    } //BrushStrokePi: {
 });