3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

removed is_step_done queries from the pipeline (using return value of set_started)

Browse source
This commit is contained in:
tamasmeszaros 2018-11-22 14:16:55 +01:00
parent 6517e2312d
commit edf80316e1
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/libslic3r/SLAPrint.cpp
View file

@ -566,7 +566,7 @@ void SLAPrint::process()
// If everything went well this code should not run at all, but // If everything went well this code should not run at all, but
// let's be robust... // let's be robust...
assert(levelids.size() == oslices.size()); // assert(levelids.size() == oslices.size());
if(levelids.size() < oslices.size()) { // extend the levels until... if(levelids.size() < oslices.size()) { // extend the levels until...
BOOST_LOG_TRIVIAL(warning) BOOST_LOG_TRIVIAL(warning)
@ -728,8 +728,8 @@ void SLAPrint::process()
st += unsigned(incr * ostepd); st += unsigned(incr * ostepd);
if(po->m_stepmask[currentstep] && !po->is_step_done(currentstep) ) { if(po->m_stepmask[currentstep] && po->set_started(currentstep)) {
po->set_started(currentstep);
set_status(st, OBJ_STEP_LABELS[currentstep]); set_status(st, OBJ_STEP_LABELS[currentstep]);
pobj_program[currentstep](*po); pobj_program[currentstep](*po);
@ -764,10 +764,9 @@ void SLAPrint::process()
throw_if_canceled(); 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_status(st, PRINT_STEP_LABELS[currentstep]);
set_started(currentstep);
print_program[currentstep](); print_program[currentstep]();
set_done(currentstep); set_done(currentstep);
} }