From 6da9d199163947a13f7b86feb2094b111366e095 Mon Sep 17 00:00:00 2001 From: bubnikv Date: Fri, 23 Nov 2018 09:33:01 +0100 Subject: [PATCH] Fixed lifting of models for SLA above the print if supports or pad are calculated. --- src/slic3r/GUI/GLCanvas3D.cpp | 2 +- src/slic3r/GUI/GUI_Preview.cpp | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/slic3r/GUI/GLCanvas3D.cpp b/src/slic3r/GUI/GLCanvas3D.cpp index bc7fa72b4..ba04a37ab 100644 --- a/src/slic3r/GUI/GLCanvas3D.cpp +++ b/src/slic3r/GUI/GLCanvas3D.cpp @@ -4060,7 +4060,7 @@ void GLCanvas3D::reload_scene(bool refresh_immediately, bool force_full_scene_re { // If any volume has been added // Shift-up all volumes of the object so that it has the right elevation with respect to the print bed - double shift_z = print_object->get_elevation(); + double shift_z = print_object->get_current_elevation(); for (GLVolume* volume : m_volumes.volumes) { if (volume->object_idx() == object_idx) diff --git a/src/slic3r/GUI/GUI_Preview.cpp b/src/slic3r/GUI/GUI_Preview.cpp index bcc488e5d..d36085309 100644 --- a/src/slic3r/GUI/GUI_Preview.cpp +++ b/src/slic3r/GUI/GUI_Preview.cpp @@ -244,14 +244,13 @@ void Preview::set_drop_target(wxDropTarget* target) void Preview::load_print() { - if (m_loaded) + if (m_loaded || m_process->current_printer_technology() != ptFFF) return; // we require that there's at least one object and the posSlice step // is performed on all of them(this ensures that _shifted_copies was // populated and we know the number of layers) unsigned int n_layers = 0; - assert(m_process->current_printer_technology() == ptFFF); const Print *print = m_process->fff_print(); if (print->is_step_done(posSlice)) {