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

Fixed build on Linux and OSx

Browse source
This commit is contained in:
Enrico Turri 2018-10-25 10:36:47 +02:00
parent 61f7849fce
commit bde5f17d5c
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/slic3r/GUI/GLCanvas3D.cpp
View file

@ -22,6 +22,7 @@
#include <wx/dcmemory.h> #include <wx/dcmemory.h>
#include <wx/image.h> #include <wx/image.h>
#include <wx/settings.h> #include <wx/settings.h>
#include <wx/tooltip.h>
// Print now includes tbb, and tbb includes Windows. This breaks compilation of wxWidgets if included before wx. // Print now includes tbb, and tbb includes Windows. This breaks compilation of wxWidgets if included before wx.
#include "../../libslic3r/Print.hpp" #include "../../libslic3r/Print.hpp"

8
src/slic3r/GUI/Plater.cpp
View file

@ -1839,10 +1839,10 @@ void Plater::priv::on_update_print_preview(wxCommandEvent &)
this->preview->reload_print(); this->preview->reload_print();
// in case this was MM print, wipe tower bounding box on 3D tab might need redrawing with exact depth: // in case this was MM print, wipe tower bounding box on 3D tab might need redrawing with exact depth:
#if !ENABLE_EXTENDED_SELECTION #if !ENABLE_EXTENDED_SELECTION
auto selections = p->collect_selections(); auto selections = collect_selections();
_3DScene::set_objects_selections(p->canvas3D, selections); _3DScene::set_objects_selections(canvas3D, selections);
if (p->canvas3D) if (canvas3D)
_3DScene::reload_scene(p->canvas3D, true); _3DScene::reload_scene(canvas3D, true);
#endif // !ENABLE_EXTENDED_SELECTION #endif // !ENABLE_EXTENDED_SELECTION
} }