mirror of
https://github.com/SoftFever/OrcaSlicer.git
synced 2025-07-08 23:46:24 -06:00
Pick updates from BS 1.9.3
sync bbl profiles FIX: [#4320] crash when edit project preset github: #4320 Change-Id: I81eb5f0d461565d63a32100a5bebb4569cfb0b1b ENH: add pctg type Jira: none Signed-off-by: qing.zhang <qing.zhang@bambulab.com> Change-Id: Ie01fcd4bef0d3ebec5bbd7185a87a1740068bdba (cherry picked from commit c6276932dd92bc4283600954415eedeac6d351ce) ENH: CLI: add logic to save metadata into 3mf from CLI JIRA: no jira Change-Id: I7f96c2ab9671ec1c0115e90f6d64230b8170eb38 (cherry picked from commit 3d2d6e23ba318a2b331a62e320f8ca199168f1f5)
This commit is contained in:
parent
6a28bae6fd
commit
b7a0b30578
16 changed files with 134 additions and 14 deletions
|
@ -96,6 +96,8 @@ Model& Model::assign_copy(const Model &rhs)
|
|||
|
||||
this->mk_name = rhs.mk_name;
|
||||
this->mk_version = rhs.mk_version;
|
||||
this->md_name = rhs.md_name;
|
||||
this->md_value = rhs.md_value;
|
||||
|
||||
return *this;
|
||||
}
|
||||
|
@ -129,6 +131,8 @@ Model& Model::assign_copy(Model &&rhs)
|
|||
this->stl_design_country = rhs.stl_design_country;
|
||||
this->mk_name = rhs.mk_name;
|
||||
this->mk_version = rhs.mk_version;
|
||||
this->md_name = rhs.md_name;
|
||||
this->md_value = rhs.md_value;
|
||||
this->backup_path = std::move(rhs.backup_path);
|
||||
this->object_backup_id_map = std::move(rhs.object_backup_id_map);
|
||||
this->next_object_backup_id = rhs.next_object_backup_id;
|
||||
|
@ -983,6 +987,8 @@ void Model::load_from(Model& model)
|
|||
profile_info = model.profile_info;
|
||||
mk_name = model.mk_name;
|
||||
mk_version = model.mk_version;
|
||||
md_name = model.md_name;
|
||||
md_value = model.md_value;
|
||||
model.design_info.reset();
|
||||
model.model_info.reset();
|
||||
model.profile_info.reset();
|
||||
|
@ -2956,7 +2962,7 @@ bool Model::obj_import_vertex_color_deal(const std::vector<unsigned char> &verte
|
|||
case _3_SAME_COLOR: {
|
||||
std::string result;
|
||||
get_real_filament_id(filament_id0, result);
|
||||
volume->mmu_segmentation_facets.set_triangle_from_string(i, result);
|
||||
volume->mmu_segmentation_facets.set_triangle_from_string(i, result);
|
||||
break;
|
||||
}
|
||||
case _3_DIFF_COLOR: {
|
||||
|
@ -3161,7 +3167,8 @@ double getadhesionCoeff(const ModelVolumePtrs objectVolumes)
|
|||
double adhesionCoeff = 1;
|
||||
for (const ModelVolume* modelVolume : objectVolumes) {
|
||||
if (Model::extruderParamsMap.find(modelVolume->extruder_id()) != Model::extruderParamsMap.end())
|
||||
if (Model::extruderParamsMap.at(modelVolume->extruder_id()).materialName == "PETG") {
|
||||
if (Model::extruderParamsMap.at(modelVolume->extruder_id()).materialName == "PETG" ||
|
||||
Model::extruderParamsMap.at(modelVolume->extruder_id()).materialName == "PCTG") {
|
||||
adhesionCoeff = 2;
|
||||
}
|
||||
else if (Model::extruderParamsMap.at(modelVolume->extruder_id()).materialName == "TPU") {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue