diff --git a/src/external/u3d/CMakeLists.txt b/src/external/u3d/CMakeLists.txt index 5d2dd45f4..ba25d48b0 100644 --- a/src/external/u3d/CMakeLists.txt +++ b/src/external/u3d/CMakeLists.txt @@ -1482,8 +1482,6 @@ elseif(WIN32) set(U3D_INSTALL_RELATIVE_PATH ".") endif() -message(--U3D_OUT_PATH: ${OUT_PATH_LIB}) - TARGET_LINK_LIBRARIES( external-IDTFConverter IFXCoreStatic ${ADDITIONAL_LIBRARIES} ${CMAKE_DL_LIBS} ) set_property(TARGET external-IDTFConverter PROPERTY FOLDER External) diff --git a/src/meshlab/mainwindow.h b/src/meshlab/mainwindow.h index efae8e25c..96ff27ef8 100644 --- a/src/meshlab/mainwindow.h +++ b/src/meshlab/mainwindow.h @@ -126,6 +126,7 @@ public slots: bool appendProject(QString fileName=QString()); void updateCustomSettings(); void updateLayerDialog(); + void applyLastFilter(); bool addRenderingDataIfNewlyGeneratedMesh(int meshid); void updateRenderingDataAccordingToActions(int meshid, const QList& acts); diff --git a/src/meshlab/mainwindow_RunTime.cpp b/src/meshlab/mainwindow_RunTime.cpp index 4d822c051..8e05418a6 100644 --- a/src/meshlab/mainwindow_RunTime.cpp +++ b/src/meshlab/mainwindow_RunTime.cpp @@ -752,6 +752,14 @@ void MainWindow::endEdit() updateLayerDialog(); } +void MainWindow::applyLastFilter() +{ + if(GLA() != nullptr && GLA()->getLastAppliedFilter() != nullptr){ + //TODO + //GLA()->getLastAppliedFilter()->trigger(); + } +} + void MainWindow::showFilterScript() { if (meshDoc()->filterHistory != nullptr)