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

Merge branch 'master' of https://github.com/prusa3d/Slic3r

Browse source
This commit is contained in:
YuSanka 2019-01-28 12:19:28 +01:00
commit b0ecf07e9b
47 changed files with 1832 additions and 507 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -626,7 +626,8 @@ const std::vector<std::string>& ObjectList::get_options_for_bundle(const wxStrin
}
#endif
return std::vector<std::string> {};
static std::vector<std::string> empty;
return empty;
}
void ObjectList::get_options_menu(settings_menu_hierarchy& settings_menu, const bool is_part)
@ -1370,15 +1371,12 @@ bool ObjectList::is_splittable()
if (!get_volume_by_item(item, volume) || !volume)
return false;
if (volume->is_splittable() != -1) // if is_splittable value is already known
return volume->is_splittable() == 0 ? false : true;
TriangleMeshPtrs meshptrs = volume->mesh.split();
bool splittable = meshptrs.size() > 1;
for (TriangleMesh* m : meshptrs) { delete m; }
volume->set_splittable(splittable ? 1 : 0);
return splittable;
int splittable = volume->is_splittable();
if (splittable == -1) {
splittable = (int)volume->mesh.has_multiple_patches();
volume->set_splittable(splittable);
}
return splittable != 0;
}
bool ObjectList::selected_instances_of_same_object()