juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-10-13 02:41:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge main branch

Browse Source
This commit is contained in:
Lam Wei Lun
2026-10-08 11:12:25 +08:00
parent 987b1b2b63 e729dbf142
commit faa64ab089
505 changed files with 19826 additions and 14837 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/slic3r/GUI/AMSMaterialsSetting.cpp
+2 -2
View File
@@ -1005,8 +1005,8 @@ bool AMSMaterialsSetting::Show(bool show)
static void _collect_filament_info(const wxString& shown_name,
const Preset& filament,
unordered_map<wxString, wxString>& query_filament_vendors,
unordered_map<wxString, wxString>& query_filament_types)
std::unordered_map<wxString, wxString>& query_filament_vendors,
std::unordered_map<wxString, wxString>& query_filament_types)
{
query_filament_vendors[shown_name] = filament.config.get_filament_vendor();
query_filament_types[shown_name] = filament.config.get_filament_type();