Merge branch 'ToolFixes' of github.com:mqg734/ninja-internal into working

Conflicts:
	js/helper-classes/RDGE/GLRectangle.js
	js/helper-classes/RDGE/GLWorld.js
	js/helper-classes/RDGE/MaterialsLibrary.js

1 files changed, 14 insertions, 4 deletions

diff --git a/js/data/pi/pi-data.js b/js/data/pi/pi-data.js
index 8ccf17cc..10b33a0e 100644
--- a/js/data/pi/pi-data.js
+++ b/js/data/pi/pi-data.js
@@ -384,7 +384,9 @@ exports.PiData = Montage.create( Montage, {
                             prop:   "strokeMaterial",
                             label: "Stroke",
                             labelField: "_name",
+                            dataField: "_name",
                             items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" },
+                            enabled: { boundObject: "this.controls", boundProperty: "useWebGl" },
                             divider : true
                         }
                     ],
@@ -395,7 +397,9 @@ exports.PiData = Montage.create( Montage, {
                             prop:   "fillMaterial",
                             label: "Fill",
                             labelField: "_name",
-                            items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" }
+                            dataField: "_name",
+                            items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" },
+                            enabled: { boundObject: "this.controls", boundProperty: "useWebGl" }
                         }
                     ]
                 ]
@@ -458,7 +462,9 @@ exports.PiData = Montage.create( Montage, {
                             id:   "stroke",
                             label: "Stroke",
                             labelField: "_name",
-                            items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" }
+                            dataField: "_name",
+                            items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" },
+                            enabled: { boundObject: "this.controls", boundProperty: "useWebGl" }
                         }
                     ]
                 ]
@@ -541,8 +547,10 @@ exports.PiData = Montage.create( Montage, {
                             id:   "strokeMaterial",
                             prop:   "strokeMaterial",
                             label: "Stroke",
-                            labelFunction: function(item) { return item.getName(); },
+                            labelField: "_name",
+                            dataField: "_name",
                             items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" },
+                            enabled: { boundObject: "this.controls", boundProperty: "useWebGl" },
                             divider : true
                         }
                     ],
@@ -553,7 +561,9 @@ exports.PiData = Montage.create( Montage, {
                             prop:   "fillMaterial",
                             label: "Fill",
                             labelField: "_name",
-                            items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" }
+                            dataField: "_name",
+                            items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" },
+                            enabled: { boundObject: "this.controls", boundProperty: "useWebGl" }
                         }
                     ]
                 ]