Merge branch 'refs/heads/master' into CSSPanelUpdates

Conflicts:
	js/panels/PanelContainer/PanelContainer.reel/PanelContainer.js

1 files changed, 14 insertions, 5 deletions

diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
index 1aa9a725..ae1bcddf 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
@@ -32,8 +32,7 @@
                         "timetext" : {"#": "time_text"},
                         "timebar" : {"#": "time_bar"},
                         "container_tracks" : {"#" : "container-tracks"},
-                        "end_hottext" : {"@" : "endHottext"},
-                        "getme" : {"#" : "getme"}
+                        "end_hottext" : {"@" : "endHottext"}
                     }
                 },
 
@@ -117,6 +116,11 @@
                                         "boundObjectPropertyPath" : "objectAtCurrentIteration.isStyleCollapsed",
                                         "oneway" : false
                                 },
+                                "bypassAnimation" : {
+                                        "boundObject" : {"@" : "repetition1"},
+                                        "boundObjectPropertyPath" : "objectAtCurrentIteration.bypassAnimation",
+                                        "oneway" : false
+                                },
                                 "dtextPositionX" : {
                                         "boundObject" : {"@" : "repetition1"},
                                         "boundObjectPropertyPath" : "objectAtCurrentIteration.dtextPositionX",
@@ -165,7 +169,7 @@
                         "bindings": {
                             "objects": {
                                 "boundObject": {"@": "owner"},
-                                "boundObjectPropertyPath": "arrTracks",
+                                "boundObjectPropertyPath": "arrLayers",
                                 "oneway": false
                             }
                         }
@@ -179,7 +183,7 @@
                         "bindings" : {
                                 "trackID" : {
                                         "boundObject" : {"@" : "repetition2"},
-                                        "boundObjectPropertyPath" : "objectAtCurrentIteration.trackID",
+                                        "boundObjectPropertyPath" : "objectAtCurrentIteration.layerID",
                                         "oneway" : false
                                 },
                                 "tweens" : {
@@ -232,6 +236,11 @@
                                         "boundObjectPropertyPath" : "objectAtCurrentIteration.isTransformCollapsed",
                                         "oneway" : false
                                 },
+                                "bypassAnimation" : {
+                                        "boundObject" : {"@" : "repetition2"},
+                                        "boundObjectPropertyPath" : "objectAtCurrentIteration.bypassAnimation",
+                                        "oneway" : false
+                                },
                                 "isStyleCollapsed" : {
                                         "boundObject" : {"@" : "repetition2"},
                                         "boundObjectPropertyPath" : "objectAtCurrentIteration.isStyleCollapsed",
@@ -285,7 +294,7 @@
                         
                         <div id="user_layers" class="userlayers">
                             <div id="master_layer" class="masterlayer">
-                                <div id="getme">Master Layer</div>
+                                <div>Master Layer</div>
                             </div>
                             <div id="container-layers">
                                 <div id="container-layer"></div>