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

Cut: Initial porting of Cut Gizmo

Browse source
This commit is contained in:
enricoturri1966 2023-10-31 23:01:05 +08:00 • committed by Noisyfox
parent ce2836a7f9
commit 18406c31c0
34 changed files with 5638 additions and 1361 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/slic3r/GUI/GUI_ObjectList.cpp
View file

@ -2811,7 +2811,7 @@ void ObjectList::merge(bool to_multipart_object)
}
}
void ObjectList::merge_volumes()
/*void ObjectList::merge_volumes()
{
std::vector<int> obj_idxs, vol_idxs;
get_selection_indexes(obj_idxs, vol_idxs);
@ -2839,11 +2839,11 @@ void ObjectList::merge_volumes()
else {
for (int vol_idx : vol_idxs)
selection.add_volume(last_obj_idx, vol_idx, 0, false);
}*/
}#1#
#else
wxGetApp().plater()->merge(obj_idxs[0], vol_idxs);
#endif
}
}*/
void ObjectList::layers_editing()
{