amd/orcaslicer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

FIX: fix modifier extruder not correct issue

Browse source 
Signed-off-by: yifan.wu <yifan.wu@bambulab.com>
Change-Id: I90e639ec1bb27efb8b10f4609d3c5fcb9eebdde8
This commit is contained in:
yifan.wu 2022-08-23 22:37:57 +08:00 committed by Lane.Wei
parent 95c285b5c1
commit 3911344495
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1842,7 +1842,10 @@ void ObjectList::load_modifier(const wxArrayString& input_files, ModelObject& mo
new_volume->name = boost::filesystem::path(input_file).filename().string(); new_volume->name = boost::filesystem::path(input_file).filename().string();
// set a default extruder value, since user can't add it manually // set a default extruder value, since user can't add it manually
// BBS // BBS
new_volume->config.set_key_value("extruder", new ConfigOptionInt(1)); int extruder_id = 0;
if (model_object.config.has("extruder"))
extruder_id = model_object.config.opt_int("extruder");
new_volume->config.set_key_value("extruder", new ConfigOptionInt(extruder_id));
// update source data // update source data
new_volume->source.input_file = input_file; new_volume->source.input_file = input_file;
new_volume->source.object_idx = obj_idx; new_volume->source.object_idx = obj_idx;
@ -1945,7 +1948,10 @@ void ObjectList::load_generic_subobject(const std::string& type_name, const Mode
new_volume->name = into_u8(name); new_volume->name = into_u8(name);
// set a default extruder value, since user can't add it manually // set a default extruder value, since user can't add it manually
// BBS // BBS
new_volume->config.set_key_value("extruder", new ConfigOptionInt(1)); int extruder_id = 0;
if (model_object.config.has("extruder"))
extruder_id = model_object.config.opt_int("extruder");
new_volume->config.set_key_value("extruder", new ConfigOptionInt(extruder_id));
new_volume->source.is_from_builtin_objects = true; new_volume->source.is_from_builtin_objects = true;
select_item([this, obj_idx, new_volume]() { select_item([this, obj_idx, new_volume]() {

2
src/slic3r/GUI/ObjectDataViewModel.cpp
View file

@ -1378,7 +1378,7 @@ void ObjectDataViewModel::UpdateVolumesExtruderBitmap(wxDataViewItem obj_item, b
return; return;
ObjectDataViewModelNode* obj_node = static_cast<ObjectDataViewModelNode*>(obj_item.GetID()); ObjectDataViewModelNode* obj_node = static_cast<ObjectDataViewModelNode*>(obj_item.GetID());
for (auto child : obj_node->GetChildren()) for (auto child : obj_node->GetChildren())
if (child->GetVolumeType() == ModelVolumeType::MODEL_PART) if (child->GetVolumeType() == ModelVolumeType::MODEL_PART || child->GetVolumeType() == ModelVolumeType::PARAMETER_MODIFIER)
child->UpdateExtruderAndColorIcon(use_obj_extruder ? obj_node->GetExtruder() : ""); child->UpdateExtruderAndColorIcon(use_obj_extruder ? obj_node->GetExtruder() : "");
} }