diff options
| author | Nivesh Rajbhandari | 2012-03-27 09:32:53 -0700 |
|---|---|---|
| committer | Nivesh Rajbhandari | 2012-03-27 09:32:53 -0700 |
| commit | 406bbfc63f8ed42d7da105dbd068a49ff8fb5f09 (patch) | |
| tree | 3a8b45f4802f002269ff1bcf596f94cee4679a07 /js/data | |
| parent | bda9f8f5829c943486f8850e68c991e83f8fb8c8 (diff) | |
| parent | 309dde5a8c4599cef6a1052c1ff9ee1ad8ec5858 (diff) | |
| download | ninja-406bbfc63f8ed42d7da105dbd068a49ff8fb5f09.tar.gz | |
Merge branch 'refs/heads/ninja-internal' into WebGLMaterials
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
Diffstat (limited to 'js/data')
| -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", |