diff --git a/dust3d.pro b/dust3d.pro index 41a2bd18..4cb3d476 100644 --- a/dust3d.pro +++ b/dust3d.pro @@ -862,10 +862,7 @@ win32 { GMP_LIBNAME = libgmp-10 MPFR_LIBNAME = libmpfr-4 - CGAL_LIBNAME = CGAL-vc140-mt-4.13 CGAL_INCLUDEDIR = $$CGAL_DIR\include - CGAL_BUILDINCLUDEDIR = $$CGAL_DIR\build\include - CGAL_LIBDIR = $$CGAL_DIR\build\lib\Release GMP_INCLUDEDIR = $$CGAL_DIR\auxiliary\gmp\include GMP_LIBDIR = $$CGAL_DIR\auxiliary\gmp\lib MPFR_INCLUDEDIR = $$GMP_INCLUDEDIR @@ -875,11 +872,8 @@ win32 { macx { GMP_LIBNAME = gmp MPFR_LIBNAME = mpfr - CGAL_LIBNAME = cgal BOOST_INCLUDEDIR = /usr/local/opt/boost/include CGAL_INCLUDEDIR = /usr/local/opt/cgal/include - CGAL_BUILDINCLUDEDIR = /usr/local/opt/cgal/include - CGAL_LIBDIR = /usr/local/opt/cgal/lib GMP_INCLUDEDIR = /usr/local/opt/gmp/include GMP_LIBDIR = /usr/local/opt/gmp/lib MPFR_INCLUDEDIR = /usr/local/opt/mpfr/include @@ -889,11 +883,8 @@ macx { unix:!macx { GMP_LIBNAME = gmp MPFR_LIBNAME = mpfr - CGAL_LIBNAME = CGAL BOOST_INCLUDEDIR = /usr/local/include CGAL_INCLUDEDIR = /usr/local/include - CGAL_BUILDINCLUDEDIR = /usr/local/include - CGAL_LIBDIR = /usr/local/lib GMP_INCLUDEDIR = /usr/local/include GMP_LIBDIR = /usr/local/lib MPFR_INCLUDEDIR = /usr/local/include @@ -909,8 +900,6 @@ INCLUDEPATH += $$MPFR_INCLUDEDIR LIBS += -L$$MPFR_LIBDIR -l$$MPFR_LIBNAME INCLUDEPATH += $$CGAL_INCLUDEDIR -INCLUDEPATH += $$CGAL_BUILDINCLUDEDIR -LIBS += -L$$CGAL_LIBDIR -l$$CGAL_LIBNAME target.path = ./ INSTALLS += target \ No newline at end of file diff --git a/src/contourtopartconverter.cpp b/src/contourtopartconverter.cpp index 91976f13..9ddeb977 100644 --- a/src/contourtopartconverter.cpp +++ b/src/contourtopartconverter.cpp @@ -25,7 +25,6 @@ ContourToPartConverter::ContourToPartConverter(const QPolygonF &mainProfile, void ContourToPartConverter::process() { convert(); - this->moveToThread(QGuiApplication::instance()->thread()); emit finished(); } diff --git a/src/documentsaver.cpp b/src/documentsaver.cpp index 937218cd..8548932f 100644 --- a/src/documentsaver.cpp +++ b/src/documentsaver.cpp @@ -36,7 +36,6 @@ void DocumentSaver::process() m_turnaroundPngByteArray, m_script, m_variables); - this->moveToThread(QGuiApplication::instance()->thread()); emit finished(); } diff --git a/src/materialpreviewsgenerator.cpp b/src/materialpreviewsgenerator.cpp index 63c5289a..07ebb5b8 100644 --- a/src/materialpreviewsgenerator.cpp +++ b/src/materialpreviewsgenerator.cpp @@ -121,6 +121,5 @@ void MaterialPreviewsGenerator::process() qDebug() << "The material previews generation took" << countTimeConsumed.elapsed() << "milliseconds"; - this->moveToThread(QGuiApplication::instance()->thread()); emit finished(); } diff --git a/src/meshgenerator.cpp b/src/meshgenerator.cpp index 6f702015..da214bc0 100644 --- a/src/meshgenerator.cpp +++ b/src/meshgenerator.cpp @@ -1438,7 +1438,6 @@ void MeshGenerator::process() { generate(); - this->moveToThread(QGuiApplication::instance()->thread()); emit finished(); } diff --git a/src/meshresultpostprocessor.cpp b/src/meshresultpostprocessor.cpp index 496bb15b..1bc7a84f 100644 --- a/src/meshresultpostprocessor.cpp +++ b/src/meshresultpostprocessor.cpp @@ -48,6 +48,5 @@ void MeshResultPostProcessor::process() { poseProcess(); - this->moveToThread(QGuiApplication::instance()->thread()); emit finished(); } diff --git a/src/motionsgenerator.cpp b/src/motionsgenerator.cpp index 20b4bcee..b95d58ea 100644 --- a/src/motionsgenerator.cpp +++ b/src/motionsgenerator.cpp @@ -450,6 +450,5 @@ void MotionsGenerator::process() qDebug() << "The motions generation took" << countTimeConsumed.elapsed() << "milliseconds"; - this->moveToThread(QGuiApplication::instance()->thread()); emit finished(); } diff --git a/src/mousepicker.cpp b/src/mousepicker.cpp index 5415416a..c6ac617b 100644 --- a/src/mousepicker.cpp +++ b/src/mousepicker.cpp @@ -115,7 +115,6 @@ void MousePicker::pick() void MousePicker::process() { pick(); - this->moveToThread(QGuiApplication::instance()->thread()); emit finished(); } diff --git a/src/normalanddepthmapsgenerator.cpp b/src/normalanddepthmapsgenerator.cpp index a980fe0c..1938d33a 100644 --- a/src/normalanddepthmapsgenerator.cpp +++ b/src/normalanddepthmapsgenerator.cpp @@ -58,7 +58,6 @@ void NormalAndDepthMapsGenerator::process() generate(); m_normalMapRender->setRenderThread(QGuiApplication::instance()->thread()); m_depthMapRender->setRenderThread(QGuiApplication::instance()->thread()); - this->moveToThread(QGuiApplication::instance()->thread()); emit finished(); } diff --git a/src/parttreewidget.cpp b/src/parttreewidget.cpp index 53b286da..9f356ee1 100644 --- a/src/parttreewidget.cpp +++ b/src/parttreewidget.cpp @@ -1195,8 +1195,8 @@ void PartTreeWidget::removeComponentDelayedTimer(const QUuid &componentId) { auto findTimer = m_delayedComponentTimers.find(componentId); if (findTimer != m_delayedComponentTimers.end()) { - m_delayedComponentTimers.erase(findTimer); findTimer->second->deleteLater(); + m_delayedComponentTimers.erase(findTimer); } } diff --git a/src/posemeshcreator.cpp b/src/posemeshcreator.cpp index 67e7a5e9..30ad0f68 100644 --- a/src/posemeshcreator.cpp +++ b/src/posemeshcreator.cpp @@ -42,6 +42,5 @@ void PoseMeshCreator::process() { createMesh(); - this->moveToThread(QGuiApplication::instance()->thread()); emit finished(); } diff --git a/src/posepreviewsgenerator.cpp b/src/posepreviewsgenerator.cpp index ab61f0b6..272d3100 100644 --- a/src/posepreviewsgenerator.cpp +++ b/src/posepreviewsgenerator.cpp @@ -68,6 +68,5 @@ void PosePreviewsGenerator::process() qDebug() << "The pose previews generation took" << countTimeConsumed.elapsed() << "milliseconds"; - this->moveToThread(QGuiApplication::instance()->thread()); emit finished(); } diff --git a/src/riggenerator.cpp b/src/riggenerator.cpp index 71d423f7..0ca5ccad 100644 --- a/src/riggenerator.cpp +++ b/src/riggenerator.cpp @@ -1144,6 +1144,5 @@ void RigGenerator::process() qDebug() << "The rig generation took" << countTimeConsumed.elapsed() << "milliseconds"; - this->moveToThread(QGuiApplication::instance()->thread()); emit finished(); } diff --git a/src/skeletonikmover.cpp b/src/skeletonikmover.cpp index 92da886c..9c828ee5 100644 --- a/src/skeletonikmover.cpp +++ b/src/skeletonikmover.cpp @@ -43,7 +43,6 @@ void SkeletonIkMover::process() { resolve(); - this->moveToThread(QGuiApplication::instance()->thread()); emit finished(); } diff --git a/src/texturegenerator.cpp b/src/texturegenerator.cpp index 72b43526..e10c6cf9 100644 --- a/src/texturegenerator.cpp +++ b/src/texturegenerator.cpp @@ -736,6 +736,5 @@ void TextureGenerator::process() { generate(); - this->moveToThread(QGuiApplication::instance()->thread()); emit finished(); } diff --git a/src/turnaroundloader.cpp b/src/turnaroundloader.cpp index 2b46044c..19633bf0 100644 --- a/src/turnaroundloader.cpp +++ b/src/turnaroundloader.cpp @@ -34,6 +34,5 @@ void TurnaroundLoader::process() } else { m_resultImage = new QImage(m_inputImage.scaled(m_viewSize, Qt::KeepAspectRatio)); } - this->moveToThread(QGuiApplication::instance()->thread()); emit finished(); } diff --git a/src/updateschecker.cpp b/src/updateschecker.cpp index 794625be..caa1d385 100644 --- a/src/updateschecker.cpp +++ b/src/updateschecker.cpp @@ -144,6 +144,5 @@ void UpdatesChecker::downloadFinished(QNetworkReply *reply) } } reply->deleteLater(); - this->moveToThread(QGuiApplication::instance()->thread()); emit finished(); }