juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-09-27 10:51:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: old preset names should resolved renamed_from field (#14429)

Browse Source 
* fix: old preset names should resolved renamed_from field

* chore: remove misleading comments

* Merge branch 'main' into fix/consider_renamed_from

* normalize_inherits

* improve find_preset2 performace
This commit is contained in:
Ian Chua
2026-06-27 22:15:43 +08:00
committed by GitHub
parent 0e4928f200
commit 0e8288de36
5 changed files with 214 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libslic3r/Preset.hpp
+14
View File
@@ -320,6 +320,20 @@ public:
std::string& inherits() { return Preset::inherits(this->config); }
const std::string& inherits() const { return Preset::inherits(const_cast<Preset*>(this)->config); }
// Rewrite cfg's "inherits" to the resolved parent's canonical name. find_preset2 may
// resolve a renamed parent, or a removed vendor profile auto-matched to the
// OrcaFilamentLibrary; persisting the canonical name lets later plain find_preset()
// callers (e.g. get_preset_parent) walk the inheritance chain without the fuzzy match.
// No-op when the parent could not be resolved or the name is already canonical.
static void normalize_inherits(DynamicPrintConfig &cfg, const Preset *resolved_parent)
{
if (resolved_parent == nullptr)
return;
std::string &inherits = Preset::inherits(cfg);
if (inherits != resolved_parent->name)
inherits = resolved_parent->name;
}
// Returns the "compatible_prints_condition".
static std::string& compatible_prints_condition(DynamicPrintConfig &cfg) { return cfg.option<ConfigOptionString>("compatible_prints_condition", true)->value; }
std::string& compatible_prints_condition() {