Fix crash

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

src/contourtopartconverter.cpp

@@ -25,7 +25,6 @@ ContourToPartConverter::ContourToPartConverter(const QPolygonF &mainProfile,
 void ContourToPartConverter::process()
 {
     convert();
-    this->moveToThread(QGuiApplication::instance()->thread());
     emit finished();
 }
 

src/documentsaver.cpp

@@ -36,7 +36,6 @@ void DocumentSaver::process()
         m_turnaroundPngByteArray,
         m_script,
         m_variables);
-    this->moveToThread(QGuiApplication::instance()->thread());
     emit finished();
 }
 

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();
 }

src/meshgenerator.cpp

@@ -1438,7 +1438,6 @@ void MeshGenerator::process()
 {
     generate();
     
-    this->moveToThread(QGuiApplication::instance()->thread());
     emit finished();
 }
 

src/meshresultpostprocessor.cpp

@@ -48,6 +48,5 @@ void MeshResultPostProcessor::process()
 {
     poseProcess();
 
-    this->moveToThread(QGuiApplication::instance()->thread());
     emit finished();
 }

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();
 }

src/mousepicker.cpp

@@ -115,7 +115,6 @@ void MousePicker::pick()
 void MousePicker::process()
 {
     pick();
-    this->moveToThread(QGuiApplication::instance()->thread());
     emit finished();
 }
 

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();
 }
 

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);
     }
 }
 

src/posemeshcreator.cpp

@@ -42,6 +42,5 @@ void PoseMeshCreator::process()
 {
     createMesh();
     
-    this->moveToThread(QGuiApplication::instance()->thread());
     emit finished();
 }

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();
 }

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();
 }

src/skeletonikmover.cpp

@@ -43,7 +43,6 @@ void SkeletonIkMover::process()
 {
     resolve();
     
-    this->moveToThread(QGuiApplication::instance()->thread());
     emit finished();
 }
 

src/texturegenerator.cpp

@@ -736,6 +736,5 @@ void TextureGenerator::process()
 {
     generate();
 
-    this->moveToThread(QGuiApplication::instance()->thread());
     emit finished();
 }

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();
 }

src/updateschecker.cpp

@@ -144,6 +144,5 @@ void UpdatesChecker::downloadFinished(QNetworkReply *reply)
         }
     }
     reply->deleteLater();
-    this->moveToThread(QGuiApplication::instance()->thread());
     emit finished();
 }