mingzailao
/
mitsuba
mirror of https://github.com/Quartenia/mitsuba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

minor cleanups

metadata
Wenzel Jakob 2014-03-05 16:18:17 +01:00
parent aa1fdb77f7
commit 4339d2339f
2 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/mtsgui/main.cpp
View File

@ -159,13 +159,6 @@ public:
} }
}; };
/* Collect zombie processes */
#if !defined(__WINDOWS__)
void collect_zombies(int s) {
while (waitpid(-1, NULL, WNOHANG) > 0);
}
#endif
#if defined(__OSX__) #if defined(__OSX__)
#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#endif #endif

2
src/mtsgui/mainwindow.cpp
View File

@ -690,7 +690,7 @@ retry:
ret = QMessageBox::question(this, tr("Version mismatch -- update scene file?"), ret = QMessageBox::question(this, tr("Version mismatch -- update scene file?"),
QString("The requested scene file is from an older version of Mitsuba " QString("The requested scene file is from an older version of Mitsuba "
"(%1). To work with version %2, it will need to be updated. If you " "(%1). To work with version %2, it will need to be updated. If you "
"continue, Mitsuba will perform a fully automated upgrade (note that a " "continue, Mitsuba will perform a fully automated upgrade (a "
"backup copy will be made).\n\nProceed?") "backup copy will be made).\n\nProceed?")
.arg(version.toString().c_str()) .arg(version.toString().c_str())
.arg(MTS_VERSION), QMessageBox::Yes | QMessageBox::Cancel); .arg(MTS_VERSION), QMessageBox::Yes | QMessageBox::Cancel);