Merge remote-tracking branch 'origin/master' into dev

This commit is contained in:
YuSanka 2022-01-24 08:37:51 +01:00
commit 7111da2dbf
41 changed files with 772 additions and 21286 deletions
src/slic3r/GUI

View file

@ -1048,8 +1048,7 @@ void Choice::set_selection()
choice_ctrl* field = dynamic_cast<choice_ctrl*>(window);
switch (m_opt.type) {
case coEnum:{
int id_value = m_opt.get_default_value<ConfigOptionEnum<SeamPosition>>()->value; //!!
field->SetSelection(id_value);
field->SetSelection(m_opt.default_value->getInt());
break;
}
case coFloat: