3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-18 04:08:02 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Dedicated objects are now not ignored

Browse source
This commit is contained in:
Lukas Matena 2018-06-22 14:03:34 +02:00
parent 6669357c81
commit e2126c2dd6
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
xs/src/libslic3r/Print.cpp
View file

@ -1198,7 +1198,7 @@ float Print::mark_wiping_extrusions(ToolOrdering::LayerTools& layer_tools, unsig
for (int i=0 ; i<(int)object_list.size() ; ++i) { // Let's iterate through all objects... for (int i=0 ; i<(int)object_list.size() ; ++i) { // Let's iterate through all objects...
const auto& object = object_list[i]; const auto& object = object_list[i];
if (!perimeters_done && (i+1==objects.size() || !objects[i+1]->config.wipe_into_objects)) { // last dedicated object in list if (!perimeters_done && (i+1==object_list.size() || !object_list[i]->config.wipe_into_objects)) { // we passed the last dedicated object in list
perimeters_done = true; perimeters_done = true;
i=-1; // let's go from the start again i=-1; // let's go from the start again
continue; continue;
@ -1224,7 +1224,7 @@ float Print::mark_wiping_extrusions(ToolOrdering::LayerTools& layer_tools, unsig
ExtrusionEntityCollection& eec = this_layer->regions[region_id]->fills; ExtrusionEntityCollection& eec = this_layer->regions[region_id]->fills;
for (ExtrusionEntity* ee : eec.entities) { // iterate through all infill Collections for (ExtrusionEntity* ee : eec.entities) { // iterate through all infill Collections
if (volume_to_wipe <= 0.f) if (volume_to_wipe <= 0.f)
break; return 0.f;
auto* fill = dynamic_cast<ExtrusionEntityCollection*>(ee); auto* fill = dynamic_cast<ExtrusionEntityCollection*>(ee);
if (fill->role() == erTopSolidInfill || fill->role() == erGapFill) // these cannot be changed - such infill is / may be visible if (fill->role() == erTopSolidInfill || fill->role() == erGapFill) // these cannot be changed - such infill is / may be visible
continue; continue;
@ -1258,12 +1258,12 @@ float Print::mark_wiping_extrusions(ToolOrdering::LayerTools& layer_tools, unsig
} }
if ((config.infill_first ? perimeters_done : !perimeters_done) && object->config.wipe_into_objects) if (object->config.wipe_into_objects && (config.infill_first ? perimeters_done : !perimeters_done))
{ {
ExtrusionEntityCollection& eec = this_layer->regions[region_id]->perimeters; ExtrusionEntityCollection& eec = this_layer->regions[region_id]->perimeters;
for (ExtrusionEntity* ee : eec.entities) { // iterate through all perimeter Collections for (ExtrusionEntity* ee : eec.entities) { // iterate through all perimeter Collections
if (volume_to_wipe <= 0.f) if (volume_to_wipe <= 0.f)
break; return 0.f;
auto* fill = dynamic_cast<ExtrusionEntityCollection*>(ee); auto* fill = dynamic_cast<ExtrusionEntityCollection*>(ee);
// What extruder would this normally be printed with? // What extruder would this normally be printed with?
unsigned int correct_extruder = get_extruder(fill, region); unsigned int correct_extruder = get_extruder(fill, region);