Merge branch 'master' into transition-offsets

2021-08-02 14:20:56 -07:00
parent 391534b71d f6eea56310
commit c3d30f1b77
61 changed files with 735 additions and 367 deletions
@@ -664,12 +664,6 @@ Block *TimelineView::GetItemAtScenePos(const rational &time, int track_index) co
  return nullptr;
 }

-void TimelineView::UserSetTime(const int64_t &time)
-{
-  SetTime(time);
-  emit TimeChanged(time);
-}
-
 void TimelineView::TrackListChanged()
 {
  UpdateSceneRect();