mirror of
https://github.com/SoftFever/OrcaSlicer.git
synced 2025-07-07 23:17:35 -06:00
FIX: support to import color in standard 3mf
Change-Id: I631e3f62c4d996924efafdfe9352d1585ad4d130 (cherry picked from commit ec08a5194b45a98973eb53ab0022a0799238134c)
This commit is contained in:
parent
56fddf988a
commit
084ea583fb
3 changed files with 93 additions and 15 deletions
|
@ -608,11 +608,15 @@ void Model::convert_multipart_object(unsigned int max_extruders)
|
|||
// Revert the centering operation.
|
||||
trafo_volume.set_offset(trafo_volume.get_offset() - o->origin_translation);
|
||||
int counter = 1;
|
||||
auto copy_volume = [o, max_extruders, &counter, &extruder_counter](ModelVolume *new_v) {
|
||||
auto copy_volume = [o, v, max_extruders, &counter, &extruder_counter](ModelVolume *new_v) {
|
||||
assert(new_v != nullptr);
|
||||
new_v->name = (counter > 1) ? o->name + "_" + std::to_string(counter++) : o->name;
|
||||
//BBS: use default extruder id
|
||||
//new_v->config.set("extruder", auto_extruder_id(max_extruders, extruder_counter));
|
||||
//BBS: Use extruder priority: volumn > object > default
|
||||
if (v->config.option("extruder"))
|
||||
new_v->config.set("extruder", v->config.extruder());
|
||||
else if (o->config.option("extruder"))
|
||||
new_v->config.set("extruder", o->config.extruder());
|
||||
|
||||
return new_v;
|
||||
};
|
||||
if (o->instances.empty()) {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue