diff --git a/toonz/sources/tcomposer/CMakeLists.txt b/toonz/sources/tcomposer/CMakeLists.txt index dea9ca5..9d537fc 100644 --- a/toonz/sources/tcomposer/CMakeLists.txt +++ b/toonz/sources/tcomposer/CMakeLists.txt @@ -10,4 +10,5 @@ target_link_libraries(tcomposer tnzstdfx sound image - colorfx) + colorfx + toonzqt) diff --git a/toonz/sources/tcomposer/tcomposer.cpp b/toonz/sources/tcomposer/tcomposer.cpp index b6cd7dc..1cd3a5b 100644 --- a/toonz/sources/tcomposer/tcomposer.cpp +++ b/toonz/sources/tcomposer/tcomposer.cpp @@ -66,6 +66,9 @@ #include "tvectorbrushstyle.h" #include "tpalette.h" +// TnzQt includes +#include "toonzqt/pluginloader.h" + // Qt includes #include #include @@ -798,6 +801,9 @@ int main(int argc, char *argv[]) factory.create(FarmControllerName, FarmControllerPort, &FarmController); } + while (!PluginLoader::load_entries("")) + app.processEvents(); + std::pair framePair(1, 0); try {