mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-05-19 11:23:42 +00:00
Apply extend_default_config_length to system profiles too
so we don't need to worry about default values for different variants
This commit is contained in:
@@ -181,10 +181,6 @@
|
|||||||
"0",
|
"0",
|
||||||
"0"
|
"0"
|
||||||
],
|
],
|
||||||
"retract_lift_enforce": [
|
|
||||||
"All Surfaces",
|
|
||||||
"All Surfaces"
|
|
||||||
],
|
|
||||||
"retraction_length": [
|
"retraction_length": [
|
||||||
"0.8",
|
"0.8",
|
||||||
"0.8"
|
"0.8"
|
||||||
@@ -226,10 +222,6 @@
|
|||||||
"0.4",
|
"0.4",
|
||||||
"0.4"
|
"0.4"
|
||||||
],
|
],
|
||||||
"travel_slope": [
|
|
||||||
"3",
|
|
||||||
"3"
|
|
||||||
],
|
|
||||||
"z_hop_types": [
|
"z_hop_types": [
|
||||||
"Auto Lift",
|
"Auto Lift",
|
||||||
"Auto Lift"
|
"Auto Lift"
|
||||||
|
|||||||
@@ -298,12 +298,6 @@
|
|||||||
"324",
|
"324",
|
||||||
"324"
|
"324"
|
||||||
],
|
],
|
||||||
"retract_lift_enforce": [
|
|
||||||
"All Surfaces",
|
|
||||||
"All Surfaces",
|
|
||||||
"All Surfaces",
|
|
||||||
"All Surfaces"
|
|
||||||
],
|
|
||||||
"retract_restart_extra": [
|
"retract_restart_extra": [
|
||||||
"0",
|
"0",
|
||||||
"0",
|
"0",
|
||||||
@@ -364,12 +358,6 @@
|
|||||||
"0.4",
|
"0.4",
|
||||||
"0.4"
|
"0.4"
|
||||||
],
|
],
|
||||||
"travel_slope": [
|
|
||||||
"3",
|
|
||||||
"3",
|
|
||||||
"3",
|
|
||||||
"3"
|
|
||||||
],
|
|
||||||
"z_hop_types": [
|
"z_hop_types": [
|
||||||
"Auto Lift",
|
"Auto Lift",
|
||||||
"Auto Lift",
|
"Auto Lift",
|
||||||
|
|||||||
@@ -3879,6 +3879,7 @@ std::pair<PresetsConfigSubstitutions, size_t> PresetBundle::load_vendor_configs_
|
|||||||
}
|
}
|
||||||
config = *default_config;
|
config = *default_config;
|
||||||
config.apply(config_src);
|
config.apply(config_src);
|
||||||
|
extend_default_config_length(config, true, *default_config);
|
||||||
if (instantiation == "false" && "Template" != vendor_name) {
|
if (instantiation == "false" && "Template" != vendor_name) {
|
||||||
config_maps.emplace(preset_name, std::move(config));
|
config_maps.emplace(preset_name, std::move(config));
|
||||||
if ((presets_collection->type() == Preset::TYPE_FILAMENT) && (!filament_id.empty()))
|
if ((presets_collection->type() == Preset::TYPE_FILAMENT) && (!filament_id.empty()))
|
||||||
|
|||||||
@@ -7461,9 +7461,6 @@ void PrintConfigDef::handle_legacy_composite(DynamicPrintConfig &config)
|
|||||||
|
|
||||||
const PrintConfigDef print_config_def;
|
const PrintConfigDef print_config_def;
|
||||||
|
|
||||||
|
|
||||||
// Orca: important! For EVERY options listed in EVERY sets below, you MUST specify the proper default value for H2D(fdm_bbl_3dp_002_common.json) and H2S(Bambu Lab H2S 0.4 nozzle.json) preset!
|
|
||||||
// Otherwise you will have modified presets dialog when you switch the profile.
|
|
||||||
//todo
|
//todo
|
||||||
std::set<std::string> print_options_with_variant = {
|
std::set<std::string> print_options_with_variant = {
|
||||||
//"initial_layer_speed",
|
//"initial_layer_speed",
|
||||||
|
|||||||
Reference in New Issue
Block a user