mirror of
https://git.mirrors.martin98.com/https://github.com/bambulab/BambuStudio.git
synced 2025-08-11 23:59:04 +08:00
FIX: CLI: fix a different_settings not set issue under CLI
jira: no-jira Change-Id: I4026d546de0a26dc34489d4704610c878bcbe65c
This commit is contained in:
parent
d74a9ac286
commit
e5c9c0fa65
@ -2138,6 +2138,7 @@ int CLI::run(int argc, char **argv)
|
||||
if (!is_bbl_3mf && config.option<ConfigOptionStrings>("different_settings_to_system")) {
|
||||
std::vector<std::string> diff_settings = config.option<ConfigOptionStrings>("different_settings_to_system")->values;
|
||||
different_process_setting = diff_settings[0];
|
||||
config.erase("different_settings_to_system");
|
||||
}
|
||||
load_process_config = std::move(config);
|
||||
BOOST_LOG_TRIVIAL(info) << boost::format("loaded process config %1%, type %2%, name %3%, inherits %4%")%file %config_name %config_from % new_process_system_name;
|
||||
@ -2951,7 +2952,7 @@ int CLI::run(int argc, char **argv)
|
||||
}
|
||||
else {
|
||||
//todo: support system process preset
|
||||
different_settings[0] = "";
|
||||
different_settings[0] = different_process_setting;
|
||||
if (new_process_config_is_system)
|
||||
inherits_group[0] = "";
|
||||
else
|
||||
@ -3092,7 +3093,17 @@ int CLI::run(int argc, char **argv)
|
||||
config.erase("filament_settings_id");
|
||||
|
||||
//todo: update different settings of filaments
|
||||
different_settings[filament_index] = "";
|
||||
if (config.option("different_settings_to_system")) {
|
||||
std::vector<std::string> filament_different_settings = config.option<ConfigOptionStrings>("different_settings_to_system", true)->values;
|
||||
if (filament_different_settings.empty())
|
||||
different_settings[filament_index] = "";
|
||||
else
|
||||
different_settings[filament_index] = filament_different_settings[0];
|
||||
config.erase("different_settings_to_system");
|
||||
}
|
||||
else {
|
||||
different_settings[filament_index] = "";
|
||||
}
|
||||
inherits_group[filament_index] = load_filaments_inherit[index];
|
||||
}
|
||||
else {
|
||||
|
Loading…
x
Reference in New Issue
Block a user