diff options
author | hwc487 | 2012-03-24 14:07:58 -0700 |
---|---|---|
committer | hwc487 | 2012-03-24 14:07:58 -0700 |
commit | cca20db1f346fc9bf2ead64c83e479f5f5ebf2d2 (patch) | |
tree | 4f5c42f0a1df00dcd1a2064dd176fcff7930ba47 /js/data/pi/pi-data.js | |
parent | 62f4327f9b83760e52a1f6bf1e689b1e0a780fbb (diff) | |
parent | 7ee75fef18c21275cf29740a6fdd81ea90e41f45 (diff) | |
download | ninja-cca20db1f346fc9bf2ead64c83e479f5f5ebf2d2.tar.gz |
Merge branch 'montage-integration' of github.com:Motorola-Mobility/ninja-internal into Textures
Diffstat (limited to 'js/data/pi/pi-data.js')
-rwxr-xr-x | js/data/pi/pi-data.js | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/js/data/pi/pi-data.js b/js/data/pi/pi-data.js index 53fec3be..52360302 100755 --- a/js/data/pi/pi-data.js +++ b/js/data/pi/pi-data.js | |||
@@ -393,6 +393,17 @@ exports.PiData = Montage.create( Montage, { | |||
393 | ], | 393 | ], |
394 | [ | 394 | [ |
395 | { | 395 | { |
396 | type: "checkbox", | ||
397 | id: "animate", | ||
398 | prop: "animate", | ||
399 | defaultValue: true, | ||
400 | value: "Animate", | ||
401 | checked: true, | ||
402 | enabled: { boundObject: "this.controls", boundProperty: "useWebGl" } | ||
403 | } | ||
404 | ], | ||
405 | [ | ||
406 | { | ||
396 | type: "dropdown", | 407 | type: "dropdown", |
397 | id: "strokeMaterial", | 408 | id: "strokeMaterial", |
398 | prop: "strokeMaterial", | 409 | prop: "strokeMaterial", |
@@ -486,6 +497,17 @@ exports.PiData = Montage.create( Montage, { | |||
486 | ], | 497 | ], |
487 | [ | 498 | [ |
488 | { | 499 | { |
500 | type: "checkbox", | ||
501 | id: "animate", | ||
502 | prop: "animate", | ||
503 | defaultValue: true, | ||
504 | value: "Animate", | ||
505 | checked: true, | ||
506 | enabled: { boundObject: "this.controls", boundProperty: "useWebGl" } | ||
507 | } | ||
508 | ], | ||
509 | [ | ||
510 | { | ||
489 | type: "dropdown", | 511 | type: "dropdown", |
490 | id: "strokeMaterial", | 512 | id: "strokeMaterial", |
491 | prop: "strokeMaterial", | 513 | prop: "strokeMaterial", |
@@ -580,6 +602,17 @@ exports.PiData = Montage.create( Montage, { | |||
580 | ], | 602 | ], |
581 | [ | 603 | [ |
582 | { | 604 | { |
605 | type: "checkbox", | ||
606 | id: "animate", | ||
607 | prop: "animate", | ||
608 | defaultValue: true, | ||
609 | value: "Animate", | ||
610 | checked: true, | ||
611 | enabled: { boundObject: "this.controls", boundProperty: "useWebGl" } | ||
612 | } | ||
613 | ], | ||
614 | [ | ||
615 | { | ||
583 | type: "dropdown", | 616 | type: "dropdown", |
584 | id: "strokeMaterial", | 617 | id: "strokeMaterial", |
585 | prop: "strokeMaterial", | 618 | prop: "strokeMaterial", |