lucaspalomodevelop/meshlab
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/meshlab.git synced 2026-03-13 00:07:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

small fixes and update vcglib

Browse Source
This commit is contained in:
alemuntoni 2020-04-17 16:44:52 +02:00
parent 4148e45dff
commit f0a570d7d5
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/meshlab/main.cpp
View File

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

2
src/meshlabplugins/io_collada/io_collada.cpp
View File

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

2
vcglib

@ -1 +1 @@
Subproject commit e9ea05be0201342d54ada396434e8af3ffdac28a
Subproject commit f7871eed2d54bee704b9f66dc538c921602323cb