Merge branch 'pentool' into brushtool

Conflicts:
	imports/codemirror/mode/scheme/scheme.js
	js/tools/BrushTool.js

1 files changed, 19 insertions, 3 deletions

diff --git a/js/data/pi/pi-data.js b/js/data/pi/pi-data.js
index 10b33a0e..ba03c347 100644..100755
--- a/js/data/pi/pi-data.js
+++ b/js/data/pi/pi-data.js
@@ -10,7 +10,21 @@ var Montage = require("montage/core/core").Montage,
 exports.PiData = Montage.create( Montage, {
 
     stagePi: {
-        value: []
+        value: [
+            {
+                label: "Style",
+
+                Section: [
+                    [
+                        {
+                            type : "chip",
+                            id : "background",
+                            prop: "background"
+                        }
+                    ]
+                ]
+            }
+        ]
     },
 
     blockPi: {
@@ -459,12 +473,14 @@ exports.PiData = Montage.create( Montage, {
                     [
                         {
                             type: "dropdown",
-                            id:   "stroke",
+                            id:   "strokeMaterial",
+                            prop:   "strokeMaterial",
                             label: "Stroke",
                             labelField: "_name",
                             dataField: "_name",
                             items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" },
-                            enabled: { boundObject: "this.controls", boundProperty: "useWebGl" }
+                            enabled: { boundObject: "this.controls", boundProperty: "useWebGl" },
+                            divider : true
                         }
                     ]
                 ]