aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/Layer.reel/Layer.html
diff options
context:
space:
mode:
authorJonathan Duran2012-05-25 14:09:33 -0700
committerJonathan Duran2012-05-25 14:09:33 -0700
commit5743d386408da3810c25e4a34e6829cac47cab06 (patch)
tree44dc57c22a29d266f491c13c1b5c8d9c55b02182 /js/panels/Timeline/Layer.reel/Layer.html
parent6808427d3c0defa9f00884711b316f4e76ac54fc (diff)
parentb0a736deb4f3bb515e0ca4009fe4f98e22cec2c0 (diff)
downloadninja-5743d386408da3810c25e4a34e6829cac47cab06.tar.gz
Merge branch 'refs/heads/timeline-local' into TimelineUber
Diffstat (limited to 'js/panels/Timeline/Layer.reel/Layer.html')
-rw-r--r--js/panels/Timeline/Layer.reel/Layer.html3
1 files changed, 2 insertions, 1 deletions
diff --git a/js/panels/Timeline/Layer.reel/Layer.html b/js/panels/Timeline/Layer.reel/Layer.html
index c7e7b575..44022211 100644
--- a/js/panels/Timeline/Layer.reel/Layer.html
+++ b/js/panels/Timeline/Layer.reel/Layer.html
@@ -17,6 +17,7 @@
17 "styleRepetition" : {"@":"repetition1"}, 17 "styleRepetition" : {"@":"repetition1"},
18 "dynamicLayerName" : {"@":"dtext1"}, 18 "dynamicLayerName" : {"@":"dtext1"},
19 "dynamicLayerTag" : {"@": "dtext2"}, 19 "dynamicLayerTag" : {"@": "dtext2"},
20 "layer_label_text" : {"#": "layer-label-text"},
20 "mainCollapser" : {"@" : "mainCollapser"}, 21 "mainCollapser" : {"@" : "mainCollapser"},
21 "positionCollapser" : {"@" : "positionCollapser"}, 22 "positionCollapser" : {"@" : "positionCollapser"},
22 "styleCollapser" : {"@" : "styleCollapser"}, 23 "styleCollapser" : {"@" : "styleCollapser"},
@@ -33,7 +34,7 @@
33 "value" : { 34 "value" : {
34 "boundObject" : {"@": "owner"}, 35 "boundObject" : {"@": "owner"},
35 "boundObjectPropertyPath" : "layerName", 36 "boundObjectPropertyPath" : "layerName",
36 "oneway" : false 37 "oneway" : true
37 } 38 }
38 } 39 }
39 }, 40 },