Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp

This commit is contained in:
Enrico Turri 2018-06-04 09:28:55 +02:00
commit 7d56b38e40
6 changed files with 67 additions and 2008 deletions

View file

@ -66,11 +66,7 @@ bool check_unsaved_changes()
bool config_wizard_startup(int app_config_exists)
%code%{
try {
RETVAL=Slic3r::GUI::config_wizard_startup(app_config_exists != 0);
} catch (std::exception& e) {
croak("%s\n", e.what());
}
RETVAL=Slic3r::GUI::config_wizard_startup(app_config_exists != 0);
%};
void open_preferences_dialog(int preferences_event)