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

FIX: filament variant index & override nil value

Browse Source 
Change-Id: I828fff09df39a60d59af516c969466d9b09e503f
Jira: none
(cherry picked from commit 1745657e222b8e9d7c96fcca16581b2deac526c6)
This commit is contained in:
chunmao.guo
2024-07-18 17:04:14 +08:00
committed by Noisyfox
parent 4bb326db16
commit 013d2d8d6e
4 changed files with 40 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/libslic3r/Preset.cpp
View File

@@ -2853,17 +2853,27 @@ void add_correct_opts_to_diff(const std::string &opt_key, t_config_option_keys&
for (int i = 0; i < int(opt_cur->values.size()); i++)
{
int init_id = i <= opt_init_max_id ? i : 0;
if (opt_cur->values[i] != opt_init->values[init_id]
&& (strict || !(opt_cur->is_nil(i) || opt_init->is_nil(init_id))))
vec.emplace_back(opt_key + "#" + std::to_string(i));
if (opt_cur->values[i] != opt_init->values[init_id]) {
if (opt_cur->nullable()) {
if (opt_cur->is_nil(i)) {
if (strict && !opt_init->is_nil(init_id))
vec.emplace_back(opt_key + "#" + std::to_string(i));
} else {
if (strict || !opt_init->is_nil(init_id))
vec.emplace_back(opt_key + "#" + std::to_string(i));
}
} else {
vec.emplace_back(opt_key + "#" + std::to_string(i));
}
}
}
}
// Use deep_diff to correct return of changed options, considering individual options for each extruder.
inline t_config_option_keys deep_diff(const ConfigBase &config_this, const ConfigBase &config_other, bool strict = false)
inline t_config_option_keys deep_diff(const ConfigBase &config_this, const ConfigBase &config_other, bool strict = true)
{
t_config_option_keys diff;
t_config_option_keys keys = config_this.keys();
t_config_option_keys keys;
if (strict) {
t_config_option_keys keys_this = config_this.keys();
t_config_option_keys keys_other = config_other.keys();