aboutsummaryrefslogtreecommitdiff
path: root/js/data/pi/pi-data.js
diff options
context:
space:
mode:
authorJon Reid2012-05-15 11:24:53 -0700
committerJon Reid2012-05-15 11:24:53 -0700
commit3e02135df2ee028ae43d0e2456c04e24ecee0e86 (patch)
treed6dcab6756e3da0038a39527cfe0f9ca89e92310 /js/data/pi/pi-data.js
parent53a604d0ccb1315576b94406cf3b0b958162307b (diff)
parente33a4e58c271a9507082694a5268b840fdd05968 (diff)
downloadninja-3e02135df2ee028ae43d0e2456c04e24ecee0e86.tar.gz
Merge branch 'timeline-local' into timeline-multiselect
Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js resolved using theirs. (selectLayers)
Diffstat (limited to 'js/data/pi/pi-data.js')
-rwxr-xr-xjs/data/pi/pi-data.js20
1 files changed, 17 insertions, 3 deletions
diff --git a/js/data/pi/pi-data.js b/js/data/pi/pi-data.js
index 157c54ec..d1dc9f34 100755
--- a/js/data/pi/pi-data.js
+++ b/js/data/pi/pi-data.js
@@ -9,6 +9,20 @@ var Montage = require("montage/core/core").Montage,
9 9
10exports.PiData = Montage.create( Montage, { 10exports.PiData = Montage.create( Montage, {
11 11
12 bodyPi: {
13 value: [
14 {
15 label: "Style",
16
17 Section: [
18 [
19
20 ]
21 ]
22 }
23 ]
24 },
25
12 stagePi: { 26 stagePi: {
13 value: [ 27 value: [
14 { 28 {
@@ -86,7 +100,7 @@ exports.PiData = Montage.create( Montage, {
86 } 100 }
87 ] 101 ]
88 }, 102 },
89 imagePi: { 103 imgPi: {
90 value: [ 104 value: [
91 { 105 {
92 label: "Image Properties", 106 label: "Image Properties",
@@ -793,8 +807,8 @@ exports.PiData = Montage.create( Montage, {
793 ] 807 ]
794 ] 808 ]
795 } 809 }
796 ] //value: [ 810 ]
797 } //BrushStrokePi: { 811 }
798}); 812});
799 813
800 814