oak-team/oak-editor
3
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'merge-timeline-and-viewer'

Browse Source
This commit is contained in:
itsmattkc
2020-01-04 02:45:26 +11:00
parent 0463106187 df837efbc6
commit 31b60664a7
22 changed files with 194 additions and 368 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/panel/timeline/timeline.cpp
+1 -1
View File
@@ -49,7 +49,7 @@ void TimelinePanel::SetTime(const int64_t &timestamp)
timeline_widget_->SetTime(timestamp);
}
void TimelinePanel::ConnectTimelineNode(TimelineOutput *node)
void TimelinePanel::ConnectTimelineNode(ViewerOutput *node)
{
timeline_widget_->ConnectTimelineNode(node);
}
app/panel/timeline/timeline.h
+1 -1
View File
@@ -36,7 +36,7 @@ public:
void Clear();
void ConnectTimelineNode(TimelineOutput* node);
void ConnectTimelineNode(ViewerOutput* node);
void DisconnectTimelineNode();