diff --git a/src/slic3r/GUI/Jobs/CreateFontNameImageJob.cpp b/src/slic3r/GUI/Jobs/CreateFontNameImageJob.cpp index f365514ce5..09f0550403 100644 --- a/src/slic3r/GUI/Jobs/CreateFontNameImageJob.cpp +++ b/src/slic3r/GUI/Jobs/CreateFontNameImageJob.cpp @@ -7,6 +7,11 @@ #include "slic3r/Utils/WxFontUtils.hpp" #include "slic3r/GUI/3DScene.hpp" // ::glsafe +// ability to request new frame after finish rendering +#include "slic3r/GUI/GUI_App.hpp" +#include "slic3r/GUI/Plater.hpp" +#include "slic3r/GUI/GLCanvas3D.hpp" + #include "wx/fontenum.h" #include @@ -98,11 +103,6 @@ void CreateFontImageJob::process(Ctl &ctl) r->encode(encoder); } -// ability to request new frame after finish rendering -#include "slic3r/GUI/GUI_App.hpp" -#include "slic3r/GUI/Plater.hpp" -#include "slic3r/GUI/GLCanvas3D.hpp" - void CreateFontImageJob::finalize(bool canceled, std::exception_ptr &) { if (m_input.count_opened_font_files) diff --git a/src/slic3r/GUI/Jobs/CreateFontStyleImagesJob.cpp b/src/slic3r/GUI/Jobs/CreateFontStyleImagesJob.cpp index cbc0b9345f..6da3695fed 100644 --- a/src/slic3r/GUI/Jobs/CreateFontStyleImagesJob.cpp +++ b/src/slic3r/GUI/Jobs/CreateFontStyleImagesJob.cpp @@ -9,6 +9,11 @@ #include "slic3r/GUI/3DScene.hpp" // ::glsafe +// ability to request new frame after finish rendering +#include "slic3r/GUI/GUI_App.hpp" +#include "slic3r/GUI/Plater.hpp" +#include "slic3r/GUI/GLCanvas3D.hpp" + using namespace Slic3r; using namespace Slic3r::GUI; @@ -126,6 +131,7 @@ void CreateFontStyleImagesJob::process(Ctl &ctl) void CreateFontStyleImagesJob::finalize(bool canceled, std::exception_ptr &) { + if (canceled) return; // upload texture on GPU GLuint tex_id; GLenum target = GL_TEXTURE_2D, format = GL_RGBA, type = GL_UNSIGNED_BYTE; @@ -150,4 +156,7 @@ void CreateFontStyleImagesJob::finalize(bool canceled, std::exception_ptr &) // bind default texture GLuint no_texture_id = 0; glsafe(::glBindTexture(target, no_texture_id)); + + // show rendered texture + wxGetApp().plater()->canvas3D()->schedule_extra_frame(0); } \ No newline at end of file