Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #45017 from chpatrick/meshlab-update
meshlab: 2016.02 -> 20180627-beta
- Loading branch information
Showing
3 changed files
with
38 additions
and
98 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
25 changes: 25 additions & 0 deletions
25
pkgs/applications/graphics/meshlab/fix-20180627-beta.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
diff --git a/src/meshlabplugins/edit_paint/paintbox.cpp b/src/meshlabplugins/edit_paint/paintbox.cpp | ||
index 2097a5b..6bcd1a4 100644 | ||
--- a/src/meshlabplugins/edit_paint/paintbox.cpp | ||
+++ b/src/meshlabplugins/edit_paint/paintbox.cpp | ||
@@ -23,6 +23,7 @@ | ||
|
||
#include "paintbox.h" | ||
#include <QFileDialog> | ||
+#include <QAction> | ||
|
||
Paintbox::Paintbox(QWidget * parent, Qt::WindowFlags flags) : QWidget(parent, flags) | ||
{ | ||
diff --git a/src/meshlabplugins/render_gdp/shaderDialog.h b/src/meshlabplugins/render_gdp/shaderDialog.h | ||
index a62d3b5..7eb1594 100644 | ||
--- a/src/meshlabplugins/render_gdp/shaderDialog.h | ||
+++ b/src/meshlabplugins/render_gdp/shaderDialog.h | ||
@@ -32,6 +32,8 @@ | ||
#include "shaderStructs.h" | ||
#include "ui_shaderDialog.h" | ||
#include <QMap> | ||
+#include <QSlider> | ||
+#include <QLineEdit> | ||
|
||
class QGLWidget; | ||
|