aboutsummaryrefslogtreecommitdiff
path: root/js/data/pi
diff options
context:
space:
mode:
authorhwc4872012-02-06 13:09:32 -0800
committerhwc4872012-02-06 13:09:32 -0800
commit1a8c017e37c5c0dec445ebafad634ef997fcd1bb (patch)
tree3380cb8ef0636dc0f662a2903f759a41749c28e0 /js/data/pi
parent465636cc0676d7fb83939d6fdb9204e474d47d46 (diff)
parent486d9a31a85dd833a1c798049a00403756703034 (diff)
downloadninja-1a8c017e37c5c0dec445ebafad634ef997fcd1bb.tar.gz
Merge branch 'ToolFixes' of github.com:mqg734/ninja-internal into working
Diffstat (limited to 'js/data/pi')
-rw-r--r--js/data/pi/pi-data.js32
1 files changed, 30 insertions, 2 deletions
diff --git a/js/data/pi/pi-data.js b/js/data/pi/pi-data.js
index 1f8870ca..8ccf17cc 100644
--- a/js/data/pi/pi-data.js
+++ b/js/data/pi/pi-data.js
@@ -288,7 +288,6 @@ exports.PiData = Montage.create( Montage, {
288 type : "color", 288 type : "color",
289 prop: "background", 289 prop: "background",
290 id : "fill", 290 id : "fill",
291 prop : "fill",
292 divider : true 291 divider : true
293 } 292 }
294 ], 293 ],
@@ -370,6 +369,16 @@ exports.PiData = Montage.create( Montage, {
370 Section: [ 369 Section: [
371 [ 370 [
372 { 371 {
372 type: "checkbox",
373 id: "useWebGl",
374 prop: "useWebGl",
375 defaultValue: false,
376 value: "Use WebGL",
377 checked: false
378 }
379 ],
380 [
381 {
373 type: "dropdown", 382 type: "dropdown",
374 id: "strokeMaterial", 383 id: "strokeMaterial",
375 prop: "strokeMaterial", 384 prop: "strokeMaterial",
@@ -435,6 +444,16 @@ exports.PiData = Montage.create( Montage, {
435 Section: [ 444 Section: [
436 [ 445 [
437 { 446 {
447 type: "checkbox",
448 id: "useWebGl",
449 prop: "useWebGl",
450 defaultValue: false,
451 value: "Use WebGL",
452 checked: false
453 }
454 ],
455 [
456 {
438 type: "dropdown", 457 type: "dropdown",
439 id: "stroke", 458 id: "stroke",
440 label: "Stroke", 459 label: "Stroke",
@@ -462,7 +481,6 @@ exports.PiData = Montage.create( Montage, {
462 type : "color", 481 type : "color",
463 prop: "background", 482 prop: "background",
464 id : "fill", 483 id : "fill",
465 prop : "fill",
466 divider : true 484 divider : true
467 } 485 }
468 ], 486 ],
@@ -509,6 +527,16 @@ exports.PiData = Montage.create( Montage, {
509 Section: [ 527 Section: [
510 [ 528 [
511 { 529 {
530 type: "checkbox",
531 id: "useWebGl",
532 prop: "useWebGl",
533 defaultValue: false,
534 value: "Use WebGL",
535 checked: false
536 }
537 ],
538 [
539 {
512 type: "dropdown", 540 type: "dropdown",
513 id: "strokeMaterial", 541 id: "strokeMaterial",
514 prop: "strokeMaterial", 542 prop: "strokeMaterial",