Merge branch 'refs/heads/ninja-internal' into MaterialsUI

1 files changed, 2 insertions, 4 deletions

diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
index eac361a8..f6fae9b8 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
@@ -37,7 +37,8 @@
                         "checkable_animated" : {"#" : "checkable_animated"},
                         "tl_configbutton" : {"#" : "tl-configbutton"},
                         "checkable_lock" : {"#" : "checkable_lock"},
-                        "checkable_visible":{"#" : "checkable_visible"}
+                        "checkable_visible":{"#" : "checkable_visible"},
+                        "play_button" : {"#" : "play_button"}
                     }
                 },
 
@@ -164,10 +165,7 @@
                     <div data-montage-id="leftpane_inside" class="leftinside">
                         <div data-montage-id="timeline_controller" class="timelinecontroller">
                             <div data-montage-id="timeline_controls" class="timelinecontrols">
-                                <div data-montage-id="rewind_button" class="rewindbutton"></div>
                                 <div data-montage-id="play_button" class="playbutton"></div>
-                                <div data-montage-id="pause_button" class="pausebutton"></div>
-                                <div data-montage-id="forward_button" class="forwardbutton"></div>
                                 <div data-montage-id="time_text" class="timetext">00:00:00</div>
                             </div>
                         </div>