juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-17 10:32:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed crashes intruduced recently into G-code generator.

Browse Source 
Added a template sort_remove_duplicates.
This commit is contained in:
bubnikv
2017-05-15 11:32:59 +02:00
parent 89e34ae1d6
commit 60c65f6da7
4 changed files with 30 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
xs/src/libslic3r/Print.cpp
View File

@@ -270,8 +270,7 @@ std::vector<unsigned int> Print::object_extruders() const
extruders.push_back((*region)->config.solid_infill_extruder - 1);
}
std::sort(extruders.begin(), extruders.end());
extruders.erase(std::unique(extruders.begin(), extruders.end()), extruders.end());
sort_remove_duplicates(extruders);
return extruders;
}
@@ -298,8 +297,7 @@ std::vector<unsigned int> Print::support_material_extruders() const
// Add all object extruders to the support extruders as it is not know which one will be used to print supports.
append(extruders, this->object_extruders());
std::sort(extruders.begin(), extruders.end());
extruders.erase(std::unique(extruders.begin(), extruders.end()), extruders.end());
sort_remove_duplicates(extruders);
return extruders;
}
@@ -308,8 +306,7 @@ std::vector<unsigned int> Print::extruders() const
{
std::vector<unsigned int> extruders = this->object_extruders();
append(extruders, this->support_material_extruders());
std::sort(extruders.begin(), extruders.end());
extruders.erase(std::unique(extruders.begin(), extruders.end()), extruders.end());
sort_remove_duplicates(extruders);
return extruders;
}