mozhe
/
BambuStudio
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX: crash while the first layer is empty 

Github: 5376

Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: I64a0612ec4bf1ead099029db5f8e9f59e0b704af
This commit is contained in:
qing.zhang 2024-11-26 09:59:16 +08:00 committed by lane.wei
parent abb8e6ed11
commit cd3f05b3fe
1 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/libslic3r/GCode/ToolOrdering.cpp
View File

@ -617,9 +617,6 @@ void ToolOrdering::reorder_extruders(std::vector<unsigned int> tool_order_layer0
if (m_layer_tools.empty()) if (m_layer_tools.empty())
return; return;
if (tool_order_layer0.empty())
return;
// Reorder the extruders of first layer // Reorder the extruders of first layer
{ {
LayerTools& lt = m_layer_tools[0]; LayerTools& lt = m_layer_tools[0];
@ -642,12 +639,31 @@ void ToolOrdering::reorder_extruders(std::vector<unsigned int> tool_order_layer0
} }
// all extruders are zero // all extruders are zero
if (lt.extruders.empty()) { if (lt.extruders.empty() && !tool_order_layer0.empty()) {
lt.extruders.push_back(tool_order_layer0[0]); lt.extruders.push_back(tool_order_layer0[0]);
} }
} }
int last_extruder_id = m_layer_tools[0].extruders.back(); int last_extruder_id = 0;
// BBS: fist layer may be empty or only has defult extrude id
if (m_layer_tools[0].extruders.empty()) {
// search for first extrude filament id
for (size_t layer_id = 1; layer_id < m_layer_tools.size(); layer_id++) {
for (auto const &extrude : m_layer_tools[layer_id].extruders) {
if (extrude != 0) {
last_extruder_id = extrude;
break;
}
}
if (last_extruder_id != 0)
break;
}
} else {
//use first layer last extruder
last_extruder_id = m_layer_tools[0].extruders.back();
}
for (int i = 1; i < m_layer_tools.size(); i++) { for (int i = 1; i < m_layer_tools.size(); i++) {
LayerTools& lt = m_layer_tools[i]; LayerTools& lt = m_layer_tools[i];