viewit/OrcaSlicer-KX
5
1
Fork 1
Code Issues Pull Requests Actions 5 Packages Projects Releases 5 Wiki Activity

Merge branch 'master' into SoftFever

Browse Source 
Signed-off-by: SoftFever <103989404+SoftFever@users.noreply.github.com>

# Conflicts:
#	resources/i18n/zh_cn/BambuStudio.mo
#	src/libslic3r/TreeSupport.cpp
#	version.inc
This commit is contained in:
SoftFever
2022-12-21 16:54:14 +08:00
parent dc1fcf7ed6 e32792c305
commit d733ab7e7b
54 changed files with 500 additions and 1230 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/slic3r/GUI/SelectMachine.cpp
View File

@@ -2930,7 +2930,7 @@ void SelectMachineDialog::set_default()
}
// material info
auto extruders = wxGetApp().plater()->get_partplate_list().get_curr_plate()->get_extruders();
auto extruders = wxGetApp().plater()->get_partplate_list().get_curr_plate()->get_used_extruders();
BitmapCache bmcache;
MaterialHash::iterator iter = m_materialList.begin();