From e886475fe7b55500d0b5db9e4b1813ab412f4b3b Mon Sep 17 00:00:00 2001 From: enricoturri1966 <enricoturri@seznam.cz> Date: Tue, 31 Mar 2020 18:04:49 +0200 Subject: [PATCH] Fixed build when tech ENABLE_NON_STATIC_CANVAS_MANAGER is disabled --- src/slic3r/GUI/GLCanvas3D.cpp | 6 ++---- src/slic3r/GUI/GLCanvas3D.hpp | 3 +++ 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/slic3r/GUI/GLCanvas3D.cpp b/src/slic3r/GUI/GLCanvas3D.cpp index 6d9c6eb24..d6ca9ca08 100644 --- a/src/slic3r/GUI/GLCanvas3D.cpp +++ b/src/slic3r/GUI/GLCanvas3D.cpp @@ -1824,14 +1824,12 @@ void GLCanvas3D::set_color_by(const std::string& value) m_color_by = value; } +#if ENABLE_NON_STATIC_CANVAS_MANAGER void GLCanvas3D::refresh_camera_scene_box() { -#if ENABLE_NON_STATIC_CANVAS_MANAGER wxGetApp().plater()->get_camera().set_scene_box(scene_bounding_box()); -#else - m_camera.set_scene_box(scene_bounding_box()); -#endif // ENABLE_NON_STATIC_CANVAS_MANAGER } +#endif // ENABLE_NON_STATIC_CANVAS_MANAGER BoundingBoxf3 GLCanvas3D::volumes_bounding_box() const { diff --git a/src/slic3r/GUI/GLCanvas3D.hpp b/src/slic3r/GUI/GLCanvas3D.hpp index 952f45c39..07fa00b9d 100644 --- a/src/slic3r/GUI/GLCanvas3D.hpp +++ b/src/slic3r/GUI/GLCanvas3D.hpp @@ -16,6 +16,9 @@ #include "GUI_ObjectLayers.hpp" #include "GLSelectionRectangle.hpp" #include "MeshUtils.hpp" +#if !ENABLE_NON_STATIC_CANVAS_MANAGER +#include "Camera.hpp" +#endif // !ENABLE_NON_STATIC_CANVAS_MANAGER #include <float.h>