merged with master

2019-03-21 17:22:36 +11:00
parent 262e93460f 1da4a315f8
commit dd06230c04
46 changed files with 943 additions and 320 deletions
@@ -243,7 +243,7 @@ void RenderThread::paint() {
  f->glClear(GL_COLOR_BUFFER_BIT);

  // Compose the current frame
-  compose_sequence(params);
+  olive::rendering::compose_sequence(params);

  // Copy composite buffer to front buffer
  // First lock the appropriate mutex for exclusivity