From bde5f17d5c2f4ac6773c8afb4b1cadb5879a4122 Mon Sep 17 00:00:00 2001 From: Enrico Turri Date: Thu, 25 Oct 2018 10:36:47 +0200 Subject: [PATCH] Fixed build on Linux and OSx --- src/slic3r/GUI/GLCanvas3D.cpp | 1 + src/slic3r/GUI/Plater.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/slic3r/GUI/GLCanvas3D.cpp b/src/slic3r/GUI/GLCanvas3D.cpp index 465dd6800..511c9a3f0 100644 --- a/src/slic3r/GUI/GLCanvas3D.cpp +++ b/src/slic3r/GUI/GLCanvas3D.cpp @@ -22,6 +22,7 @@ #include #include #include +#include // Print now includes tbb, and tbb includes Windows. This breaks compilation of wxWidgets if included before wx. #include "../../libslic3r/Print.hpp" diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp index 2de1cfbf1..c34aab068 100644 --- a/src/slic3r/GUI/Plater.cpp +++ b/src/slic3r/GUI/Plater.cpp @@ -1839,10 +1839,10 @@ void Plater::priv::on_update_print_preview(wxCommandEvent &) this->preview->reload_print(); // in case this was MM print, wipe tower bounding box on 3D tab might need redrawing with exact depth: #if !ENABLE_EXTENDED_SELECTION - auto selections = p->collect_selections(); - _3DScene::set_objects_selections(p->canvas3D, selections); - if (p->canvas3D) - _3DScene::reload_scene(p->canvas3D, true); + auto selections = collect_selections(); + _3DScene::set_objects_selections(canvas3D, selections); + if (canvas3D) + _3DScene::reload_scene(canvas3D, true); #endif // !ENABLE_EXTENDED_SELECTION }