diff options
author | Jose Antonio Marquez | 2012-02-11 22:33:26 -0800 |
---|---|---|
committer | Jose Antonio Marquez | 2012-02-11 22:33:26 -0800 |
commit | c6ed3331e88eb01a52ac533e5449df3af2fb5965 (patch) | |
tree | 2b660dc94a98bad02b46ba44a28424d692435fb3 /js/data/pi | |
parent | 5d38e575b2bafeae9bd676247fce15ec5f78fa32 (diff) | |
parent | e142611e22718b1f1d1696902ad9161ec5f33f98 (diff) | |
download | ninja-c6ed3331e88eb01a52ac533e5449df3af2fb5965.tar.gz |
Merge branch 'refs/heads/NinjaInternal' into 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 39194412..eba55535 100644 --- a/js/data/pi/pi-data.js +++ b/js/data/pi/pi-data.js | |||
@@ -452,12 +452,14 @@ exports.PiData = Montage.create( Montage, { | |||
452 | [ | 452 | [ |
453 | { | 453 | { |
454 | type: "dropdown", | 454 | type: "dropdown", |
455 | id: "stroke", | 455 | id: "strokeMaterial", |
456 | prop: "strokeMaterial", | ||
456 | label: "Stroke", | 457 | label: "Stroke", |
457 | labelField: "_name", | 458 | labelField: "_name", |
458 | dataField: "_name", | 459 | dataField: "_name", |
459 | items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" }, | 460 | items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" }, |
460 | enabled: { boundObject: "this.controls", boundProperty: "useWebGl" } | 461 | enabled: { boundObject: "this.controls", boundProperty: "useWebGl" }, |
462 | divider : true | ||
461 | } | 463 | } |
462 | ] | 464 | ] |
463 | ] | 465 | ] |