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

merged with master

Browse Source
This commit is contained in:
itsmattkc
2019-03-29 15:45:51 +11:00
parent 31bb862715 a581d36bcc
commit a223b47909
19 changed files with 1115 additions and 914 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rendering/renderfunctions.cpp
+2 -3
View File
@@ -748,7 +748,6 @@ GLuint olive::rendering::compose_sequence(ComposeSequenceParams &params) {
// == END FINAL DRAW ON SEQUENCE BUFFER ==
}
}
} else {
if (c->media() != nullptr && c->media()->get_type() == MEDIA_TYPE_SEQUENCE) {
@@ -778,8 +777,8 @@ GLuint olive::rendering::compose_sequence(ComposeSequenceParams &params) {
}
}
if (audio_track_count == 0 && params.viewer != nullptr) {
params.viewer->play_wake();
if (audio_track_count == 0) {
WakeAudioWakeObject();
}
if (!params.nests.isEmpty() && !params.nests.last()->fbo.isEmpty()) {