juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-10-13 10:51:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into belt-printer

Browse Source
This commit is contained in:
Joseph Robertson
2026-10-07 14:14:20 -05:00
committed by GitHub
parent 827efc3bc2 e027f8b225
commit e39d6cc089
241 changed files with 1047 additions and 1771 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/slic3r/GUI/3DScene.cpp
+1 -1
View File
@@ -1592,7 +1592,7 @@ bool GLVolumeCollection::check_outside_state(const BuildVolume &build_volume, Mo
{
std::vector<int> result_filaments;
//result_filaments.reserve(conflict_filaments.size());
std::set_intersection (conflict_filament_vector.begin(), conflict_filament_vector.end(), unprintable_filament_vec[index].begin(), unprintable_filament_vec[index].end(), insert_iterator<vector<int>>(result_filaments, result_filaments.begin()));
std::set_intersection (conflict_filament_vector.begin(), conflict_filament_vector.end(), unprintable_filament_vec[index].begin(), unprintable_filament_vec[index].end(), std::insert_iterator<std::vector<int>>(result_filaments, result_filaments.begin()));
conflict_filament_vector = result_filaments;
}
}