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

Fixed a crash when complete_objects was turned on

Browse source
This commit is contained in:
Lukas Matena 2018-06-27 15:49:02 +02:00
parent 54bd0af905
commit bb288f2a1b
1 changed files with 17 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
xs/src/libslic3r/GCode/ToolOrdering.cpp
View file

@ -138,15 +138,19 @@ void ToolOrdering::collect_extruders(const PrintObject &object)
const PrintRegion &region = *object.print()->regions[region_id]; const PrintRegion &region = *object.print()->regions[region_id];
if (! layerm->perimeters.entities.empty()) { if (! layerm->perimeters.entities.empty()) {
bool something_nonoverriddable = false; bool something_nonoverriddable = true;
for (const auto& eec : layerm->perimeters.entities) // let's check if there are nonoverriddable entities
if (!layer_tools.wiping_extrusions.is_overriddable(dynamic_cast<const ExtrusionEntityCollection&>(*eec), *m_print_config_ptr, object, region)) { if (m_print_config_ptr) { // in this case complete_objects is false (see ToolOrdering constructors)
something_nonoverriddable = true; something_nonoverriddable = false;
break; for (const auto& eec : layerm->perimeters.entities) // let's check if there are nonoverriddable entities
} if (!layer_tools.wiping_extrusions.is_overriddable(dynamic_cast<const ExtrusionEntityCollection&>(*eec), *m_print_config_ptr, object, region)) {
something_nonoverriddable = true;
break;
}
}
if (something_nonoverriddable) if (something_nonoverriddable)
layer_tools.extruders.push_back(region.config.perimeter_extruder.value); layer_tools.extruders.push_back(region.config.perimeter_extruder.value);
layer_tools.has_object = true; layer_tools.has_object = true;
} }
@ -164,10 +168,13 @@ void ToolOrdering::collect_extruders(const PrintObject &object)
else if (role != erNone) else if (role != erNone)
has_infill = true; has_infill = true;
if (!something_nonoverriddable && !layer_tools.wiping_extrusions.is_overriddable(*fill, *m_print_config_ptr, object, region)) if (m_print_config_ptr) {
something_nonoverriddable = true; if (!something_nonoverriddable && !layer_tools.wiping_extrusions.is_overriddable(*fill, *m_print_config_ptr, object, region))
something_nonoverriddable = true;
}
} }
if (something_nonoverriddable)
if (something_nonoverriddable || !m_print_config_ptr)
{ {
if (has_solid_infill) if (has_solid_infill)
layer_tools.extruders.push_back(region.config.solid_infill_extruder); layer_tools.extruders.push_back(region.config.solid_infill_extruder);