From f0a570d7d5543cb60417dee17b1fdcd13536268b Mon Sep 17 00:00:00 2001 From: alemuntoni Date: Fri, 17 Apr 2020 16:44:52 +0200 Subject: [PATCH] small fixes and update vcglib --- src/meshlab/main.cpp | 4 +--- src/meshlabplugins/io_collada/io_collada.cpp | 2 +- vcglib | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/meshlab/main.cpp b/src/meshlab/main.cpp index 14868773f..7606c43b9 100644 --- a/src/meshlab/main.cpp +++ b/src/meshlab/main.cpp @@ -106,10 +106,8 @@ int main(int argc, char *argv[]) void handleCriticalError(const MLException& exc){ - bool openGLProblem = false; QString message = "MeshLab was not able to start.\n"; if (QString::fromStdString(exc.what()).contains("GLEW initialization failed")){ - openGLProblem = true; message.append("Please check your Graphics drivers.\n"); } message.append("\nError: " + QString::fromStdString(exc.what())); @@ -122,7 +120,7 @@ void handleCriticalError(const MLException& exc){ #ifdef _WIN32 QCheckBox *cb = nullptr; - if (openGLProblem) { + if (QString::fromStdString(exc.what()).contains("GLEW initialization failed")) { cb = new QCheckBox("Use CPU OpenGL and restart MeshLab"); messageBox.setCheckBox(cb); } diff --git a/src/meshlabplugins/io_collada/io_collada.cpp b/src/meshlabplugins/io_collada/io_collada.cpp index 217907e10..f6f432bae 100644 --- a/src/meshlabplugins/io_collada/io_collada.cpp +++ b/src/meshlabplugins/io_collada/io_collada.cpp @@ -175,7 +175,7 @@ void ColladaIOPlugin::initPreOpenParameter(const QString &/*format*/, const QStr qDebug("Node %i geom id = '%s'",i,qUtf8Printable(idVal)); } parlst.addParam(new RichEnum("geomnode",0, idList, tr("geometry nodes"), tr("dsasdfads"))); - qDebug("Time elapsed: %d ms", t.elapsed()); + qDebug("Time elapsed: %llu ms", t.elapsed()); } diff --git a/vcglib b/vcglib index e9ea05be0..f7871eed2 160000 --- a/vcglib +++ b/vcglib @@ -1 +1 @@ -Subproject commit e9ea05be0201342d54ada396434e8af3ffdac28a +Subproject commit f7871eed2d54bee704b9f66dc538c921602323cb