blending modes are loaded modularly now

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
+3 -2
View File
@@ -32,6 +32,7 @@
#include "rendering/renderfunctions.h"
#include "io/previewgenerator.h"
#include "effects/internal/voideffect.h"
#include "project/effectloaders.h"
#include "debug.h"
#include <QFile>
@@ -115,7 +116,7 @@ void LoadThread::load_effect(QXmlStreamReader& stream, Clip* c) {
// Effect loading occurs in another thread, and while it's usually very quick, just for safety we wait here
// for all the effects to finish loading
panel_effect_controls->effects_loaded.lock();
olive::effects_loaded.lock();
const EffectMeta* meta = nullptr;
@@ -124,7 +125,7 @@ void LoadThread::load_effect(QXmlStreamReader& stream, Clip* c) {
meta = get_meta_from_name(effect_name);
}
panel_effect_controls->effects_loaded.unlock();
olive::effects_loaded.unlock();
int type;
if (tag == "opening") {