3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-10-24 01:01:15 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Merge remote-tracking branch 'remotes/origin/master' into dev

Browse source
This commit is contained in:
bubnikv 2019-09-12 10:19:09 +02:00
commit b4f2df6a98
30 changed files with 635 additions and 904 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/libslic3r/GCode/Analyzer.cpp
View file

@ -529,7 +529,10 @@ void GCodeAnalyzer::_processT(const std::string& cmd)
if (_get_extruder_id() != id)
{
if (id >= m_extruders_count)
BOOST_LOG_TRIVIAL(error) << "GCodeAnalyzer encountered an invalid toolchange, maybe from a custom gcode.";
{
if (m_extruders_count > 1)
BOOST_LOG_TRIVIAL(error) << "GCodeAnalyzer encountered an invalid toolchange, maybe from a custom gcode.";
}
else
_set_extruder_id(id);