juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-09-17 05:52:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge main and fixed conflicts

Browse Source
This commit is contained in:
Lam Wei Lun
2026-09-03 10:55:01 +08:00
parent 9b8d93bef2 e6501bb1ce
commit 686b7f66ac
122 changed files with 3445 additions and 1959 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libslic3r/PresetBundle.cpp
+6 -11
View File
@@ -2217,15 +2217,11 @@ int PresetBundle::validate_presets(const std::string& file_name, DynamicPrintCon
void PresetBundle::remove_users_preset(AppConfig& config, std::map<std::string, std::map<std::string, std::string>>* my_presets)
{
auto check_removed = [my_presets, this](Preset& preset) -> bool {
if (my_presets == nullptr)
return true;
if (my_presets->find(preset.name) != my_presets->end())
return false;
if (!preset.sync_info.empty())
return false; // syncing, not remove
if (preset.setting_id.empty())
return false; // no id, not remove
auto check_removed = [my_presets](Preset &preset) -> bool {
if (my_presets == nullptr) return true;
if (my_presets->find(preset.name) != my_presets->end()) return false;
if (!preset.sync_info.empty()) return false; // syncing, not remove
if (preset.setting_id.empty()) return false; // no id, not remove
// Saved preset is removed by another session
if (preset.is_dirty) {
preset.setting_id.clear();
@@ -3533,8 +3529,7 @@ void PresetBundle::get_ams_cobox_infos(AMSComboInfo& combox_info)
combox_info.ams_names.push_back(ams_name);
continue;
}
iter = std::find_if(filaments.begin(), filaments.end(),
[&filament_type](auto& f) { return f.is_compatible && f.is_system; });
iter = std::find_if(filaments.begin(), filaments.end(), [](auto &f) { return f.is_compatible && f.is_system; });
if (iter == filaments.end())
continue;
}