juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-19 11:23:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix save custom machine profiles with different extruder count (#13035)

Browse Source 
* fix save profiles

* clean 1

* copilot suggestions
This commit is contained in:
Rodrigo Faselli
2026-04-05 23:01:58 -03:00
committed by GitHub
parent cfc2e9b62a
commit 05e397f98d
1 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/libslic3r/Config.hpp
View File

@@ -587,26 +587,30 @@ public:
auto rhs_opt = static_cast<const ConfigOptionVector<T>*>(rhs); auto rhs_opt = static_cast<const ConfigOptionVector<T>*>(rhs);
auto inherits_opt = static_cast<const ConfigOptionVector<T>*>(inherits); auto inherits_opt = static_cast<const ConfigOptionVector<T>*>(inherits);
if (inherits->size() != rhs->size()) if (stride <= 0)
throw ConfigurationError("ConfigOptionVector::set_with_nil(): rhs size different with inherits size"); throw ConfigurationError("ConfigOptionVector::set_with_nil(): invalid stride");
this->values.resize(inherits->size(), this->values.front()); // Tolerate legacy/transitional presets where vector sizes may diverge
// (for example after reducing extruder/variant count).
// Keep rhs as source of truth and nil-mark only on overlapping range.
this->values = rhs_opt->values;
for (size_t i = 0; i < inherits_opt->size(); i= i+stride) { const size_t overlap_size = std::min(rhs_opt->size(), inherits_opt->size());
for (size_t i = 0; i < overlap_size; i += size_t(stride)) {
const size_t group_size = std::min(size_t(stride), overlap_size - i);
bool set_nil = true; bool set_nil = true;
for (size_t j = 0; j < stride; j++) { for (size_t j = 0; j < group_size; ++j) {
if (inherits_opt->values[i +j] != rhs_opt->values[i +j]) { if (inherits_opt->values[i + j] != rhs_opt->values[i + j]) {
set_nil = false; set_nil = false;
break; break;
} }
} }
for (size_t j = 0; j < stride; j++) { for (size_t j = 0; j < group_size; ++j) {
if (set_nil) { if (set_nil) {
this->set_at_to_nil(i +j); this->set_at_to_nil(i + j);
} }
else
this->values[i +j] = rhs_opt->values[i +j];
} }
} }
} }