Merge remote-tracking branch 'origin/master' into feature_arrange_with_libnest2d

This commit is contained in:
tamasmeszaros 2018-08-08 12:52:02 +02:00
commit 1764f3b57b

View File

@ -721,6 +721,8 @@ namespace Slic3r {
} }
_last_st_synchronized_block_id = _blocks.size() - 1; _last_st_synchronized_block_id = _blocks.size() - 1;
// The additional time has been consumed (added to the total time), reset it to zero.
set_additional_time(0.);
} }
void GCodeTimeEstimator::_process_gcode_line(GCodeReader&, const GCodeReader::GCodeLine& line) void GCodeTimeEstimator::_process_gcode_line(GCodeReader&, const GCodeReader::GCodeLine& line)