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

blending modes are loaded modularly now

Browse Source
This commit is contained in:
itsmattkc
2019-03-10 10:10:52 +11:00
parent c056c9d803
commit a0851afc96
32 changed files with 352 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rendering/renderthread.cpp
+3
View File
@@ -32,6 +32,7 @@ namespace OCIO = OCIO_NAMESPACE;
#include "rendering/renderfunctions.h"
#include "project/sequence.h"
#include "project/effectloaders.h"
RenderThread::RenderThread() :
gizmos(nullptr),
@@ -99,7 +100,9 @@ void RenderThread::run() {
blend_mode_program = new QOpenGLShaderProgram();
blend_mode_program->addShaderFromSourceFile(QOpenGLShader::Vertex, ":/internalshaders/common.vert");
olive::effects_loaded.lock();
blend_mode_program->addShaderFromSourceCode(QOpenGLShader::Fragment, olive::generated_blending_shader);
olive::effects_loaded.unlock();
blend_mode_program->link();
premultiply_program = new QOpenGLShaderProgram();