aboutsummaryrefslogtreecommitdiff
path: root/js/data/pi
diff options
context:
space:
mode:
authorEric Guzman2012-03-27 10:22:42 -0700
committerEric Guzman2012-03-27 10:22:42 -0700
commit309b201017da2a4094df4f06adeeff9d396b193a (patch)
tree92257b32855bcd31dd74967b085a6632fd7dbe9b /js/data/pi
parentda03585a0b03220281f6d54d9acf0ae0fafaef16 (diff)
parent309dde5a8c4599cef6a1052c1ff9ee1ad8ec5858 (diff)
downloadninja-309b201017da2a4094df4f06adeeff9d396b193a.tar.gz
Merge branch 'refs/heads/master' into PresetsPI
Diffstat (limited to 'js/data/pi')
-rwxr-xr-xjs/data/pi/pi-data.js33
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",