From ed0f3b340650a7ecfadee198e0f97ac152b47c12 Mon Sep 17 00:00:00 2001 From: enricoturri1966 <enricoturri@seznam.cz> Date: Wed, 25 Mar 2020 13:55:17 +0100 Subject: [PATCH] Small refactoring --- src/slic3r/GUI/3DBed.cpp | 3 --- src/slic3r/GUI/GUI_Preview.cpp | 2 ++ 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/slic3r/GUI/3DBed.cpp b/src/slic3r/GUI/3DBed.cpp index 5ac3899c1..23acd18ef 100644 --- a/src/slic3r/GUI/3DBed.cpp +++ b/src/slic3r/GUI/3DBed.cpp @@ -10,9 +10,6 @@ #include "PresetBundle.hpp" #include "Gizmos/GLGizmoBase.hpp" #include "GLCanvas3D.hpp" -#if ENABLE_NON_STATIC_CANVAS_MANAGER -#include "GLCanvas3DManager.hpp" -#endif // ENABLE_NON_STATIC_CANVAS_MANAGER #include <GL/glew.h> diff --git a/src/slic3r/GUI/GUI_Preview.cpp b/src/slic3r/GUI/GUI_Preview.cpp index 704d1ea95..d94cba974 100644 --- a/src/slic3r/GUI/GUI_Preview.cpp +++ b/src/slic3r/GUI/GUI_Preview.cpp @@ -56,7 +56,9 @@ View3D::~View3D() _3DScene::remove_canvas(m_canvas_widget); #endif // !ENABLE_NON_STATIC_CANVAS_MANAGER delete m_canvas_widget; +#if !ENABLE_NON_STATIC_CANVAS_MANAGER m_canvas = nullptr; +#endif // !ENABLE_NON_STATIC_CANVAS_MANAGER } }