3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
YuSanka 2018-04-27 15:40:25 +02:00
commit 9fb8ee9377
17 changed files with 892 additions and 455 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/Slic3r.pm
View file

@ -161,8 +161,12 @@ sub thread_cleanup {
*Slic3r::Print::SupportMaterial2::DESTROY = sub {};
*Slic3r::TriangleMesh::DESTROY = sub {};
*Slic3r::GUI::AppConfig::DESTROY = sub {};
*Slic3r::GUI::GCodePreviewData::DESTROY = sub {};
*Slic3r::GUI::PresetBundle::DESTROY = sub {};
*Slic3r::GUI::Tab::DESTROY = sub {};
*Slic3r::GUI::PresetHints::DESTROY = sub {};
*Slic3r::GUI::TabIface::DESTROY = sub {};
*Slic3r::OctoPrint::DESTROY = sub {};
*Slic3r::PresetUpdater::DESTROY = sub {};
return undef; # this prevents a "Scalars leaked" warning
}

2
lib/Slic3r/GUI/3DScene.pm
View file

@ -389,7 +389,7 @@ sub mouse_event {
$self->_mouse_dragging($e->Dragging);
if ($e->Entering && &Wx::wxMSW) {
if ($e->Entering && (&Wx::wxMSW || $^O eq 'linux')) {
# wxMSW needs focus in order to catch mouse wheel events
$self->SetFocus;
$self->_drag_start_xy(undef);