diff options
author | Valerio Virgillito | 2012-02-12 21:50:49 -0800 |
---|---|---|
committer | Valerio Virgillito | 2012-02-12 21:50:49 -0800 |
commit | dcd147265ad0339448ea4466253b03b2899e0cea (patch) | |
tree | a2afd9a3f4b4545141b21a31002d81bb5f79f44b /js/data/pi | |
parent | a30d76ff641ce89686cf5fbd9f04ac9ab4e9c830 (diff) | |
parent | e142611e22718b1f1d1696902ad9161ec5f33f98 (diff) | |
download | ninja-dcd147265ad0339448ea4466253b03b2899e0cea.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into stage-color
Diffstat (limited to 'js/data/pi')
-rw-r--r-- | js/data/pi/pi-data.js | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/js/data/pi/pi-data.js b/js/data/pi/pi-data.js index a6811a20..ba03c347 100644 --- a/js/data/pi/pi-data.js +++ b/js/data/pi/pi-data.js | |||
@@ -473,12 +473,14 @@ exports.PiData = Montage.create( Montage, { | |||
473 | [ | 473 | [ |
474 | { | 474 | { |
475 | type: "dropdown", | 475 | type: "dropdown", |
476 | id: "stroke", | 476 | id: "strokeMaterial", |
477 | prop: "strokeMaterial", | ||
477 | label: "Stroke", | 478 | label: "Stroke", |
478 | labelField: "_name", | 479 | labelField: "_name", |
479 | dataField: "_name", | 480 | dataField: "_name", |
480 | items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" }, | 481 | items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" }, |
481 | enabled: { boundObject: "this.controls", boundProperty: "useWebGl" } | 482 | enabled: { boundObject: "this.controls", boundProperty: "useWebGl" }, |
483 | divider : true | ||
482 | } | 484 | } |
483 | ] | 485 | ] |
484 | ] | 486 | ] |