Merge branch 'master' into updating

This commit is contained in:
Vojtech Kral 2018-04-24 18:11:34 +02:00
commit a50bde4267
14 changed files with 280 additions and 174 deletions

View file

@ -162,6 +162,7 @@ sub thread_cleanup {
*Slic3r::TriangleMesh::DESTROY = sub {};
*Slic3r::GUI::AppConfig::DESTROY = sub {};
*Slic3r::GUI::PresetBundle::DESTROY = sub {};
*Slic3r::GUI::Tab::DESTROY = sub {};
*Slic3r::PresetUpdater::DESTROY = sub {};
return undef; # this prevents a "Scalars leaked" warning
}