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

Merge branch 'master' of https://github.com/prusa3d/Slic3r

Browse source
This commit is contained in:
bubnikv 2019-03-01 10:09:26 +01:00
commit f4b2d51f47
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/libslic3r/GCode.cpp
View file

@ -2488,6 +2488,10 @@ std::string GCode::_extrude(const ExtrusionPath &path, std::string description,
// adds analyzer tags and updates analyzer's tracking data // adds analyzer tags and updates analyzer's tracking data
if (m_enable_analyzer) if (m_enable_analyzer)
{ {
// PrusaMultiMaterial::Writer may generate GCodeAnalyzer::Height_Tag and GCodeAnalyzer::Width_Tag lines without updating m_last_height and m_last_width
// so, if the last role was erWipeTower we force export of GCodeAnalyzer::Height_Tag and GCodeAnalyzer::Width_Tag lines
bool last_was_wipe_tower = (m_last_analyzer_extrusion_role == erWipeTower);
if (path.role() != m_last_analyzer_extrusion_role) if (path.role() != m_last_analyzer_extrusion_role)
{ {
m_last_analyzer_extrusion_role = path.role(); m_last_analyzer_extrusion_role = path.role();
@ -2505,7 +2509,7 @@ std::string GCode::_extrude(const ExtrusionPath &path, std::string description,
gcode += buf; gcode += buf;
} }
if (m_last_width != path.width) if (last_was_wipe_tower || (m_last_width != path.width))
{ {
m_last_width = path.width; m_last_width = path.width;
@ -2514,7 +2518,7 @@ std::string GCode::_extrude(const ExtrusionPath &path, std::string description,
gcode += buf; gcode += buf;
} }
if (m_last_height != path.height) if (last_was_wipe_tower || (m_last_height != path.height))
{ {
m_last_height = path.height; m_last_height = path.height;