diff options
author | Nivesh Rajbhandari | 2012-02-07 10:58:14 -0800 |
---|---|---|
committer | Nivesh Rajbhandari | 2012-02-07 10:58:14 -0800 |
commit | 486842239c71e7964f38a09aacda4970f2a82e1a (patch) | |
tree | 20a6688d296b1ef09bf32add9dfdef586bfe4207 /js/data/pi | |
parent | 789eaf5a92c903f27462c69a8890fbec695ab14e (diff) | |
download | ninja-486842239c71e7964f38a09aacda4970f2a82e1a.tar.gz |
Updated tools and PI to get/set materials by binding to appModel's materials property. This requires us to add FlatMaterial to the list of materials in the MaterialsLibrary.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
Diffstat (limited to 'js/data/pi')
-rw-r--r-- | js/data/pi/pi-data.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/data/pi/pi-data.js b/js/data/pi/pi-data.js index 901ca37f..de192b57 100644 --- a/js/data/pi/pi-data.js +++ b/js/data/pi/pi-data.js | |||
@@ -544,7 +544,7 @@ exports.PiData = Montage.create( Montage, { | |||
544 | id: "strokeMaterial", | 544 | id: "strokeMaterial", |
545 | prop: "strokeMaterial", | 545 | prop: "strokeMaterial", |
546 | label: "Stroke", | 546 | label: "Stroke", |
547 | labelFunction: function(item) { return item.getName(); }, | 547 | labelField: "_name", |
548 | items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" }, | 548 | items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" }, |
549 | enabled: { boundObject: "this.controls", boundProperty: "useWebGl" }, | 549 | enabled: { boundObject: "this.controls", boundProperty: "useWebGl" }, |
550 | divider : true | 550 | divider : true |