From edf80316e10143cbd15aaa06157b9b3b8d3bd6b0 Mon Sep 17 00:00:00 2001 From: tamasmeszaros Date: Thu, 22 Nov 2018 14:16:55 +0100 Subject: [PATCH] removed is_step_done queries from the pipeline (using return value of set_started) --- src/libslic3r/SLAPrint.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/libslic3r/SLAPrint.cpp b/src/libslic3r/SLAPrint.cpp index 9f1ba4cc0..7a5b9053a 100644 --- a/src/libslic3r/SLAPrint.cpp +++ b/src/libslic3r/SLAPrint.cpp @@ -566,7 +566,7 @@ void SLAPrint::process() // If everything went well this code should not run at all, but // let's be robust... - assert(levelids.size() == oslices.size()); + // assert(levelids.size() == oslices.size()); if(levelids.size() < oslices.size()) { // extend the levels until... BOOST_LOG_TRIVIAL(warning) @@ -728,8 +728,8 @@ void SLAPrint::process() st += unsigned(incr * ostepd); - if(po->m_stepmask[currentstep] && !po->is_step_done(currentstep) ) { - po->set_started(currentstep); + if(po->m_stepmask[currentstep] && po->set_started(currentstep)) { + set_status(st, OBJ_STEP_LABELS[currentstep]); pobj_program[currentstep](*po); @@ -764,10 +764,9 @@ void SLAPrint::process() throw_if_canceled(); - if(m_stepmask[currentstep] && !is_step_done(currentstep)) + if(m_stepmask[currentstep] && set_started(currentstep)) { set_status(st, PRINT_STEP_LABELS[currentstep]); - set_started(currentstep); print_program[currentstep](); set_done(currentstep); }