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

Sync upstream main

Browse Source 
Pulls latest upstream fixes (Default filament option #13887, SEMM
multi-extruder crash #13896, linux wxstring crash #13925, Polymaker
profiles, et al.).
This commit is contained in:
Clifford Garwood committed 2026-05-29 09:50:18 -04:00
2 parents b2f548b098 6b55e324c9
commit ed6c608dc2
1309 files changed
+30869 -26749
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/slic3r/GUI/PartPlate.cpp
+18 -18
View File
@@ -2690,31 +2690,31 @@ std::vector<int> PartPlate::get_extruders(bool conside_custom_gcode) const
plate_extruders.push_back(glb_support_extr);
}
int obj_wall_extr = 1;
int obj_wall_extr = 0;
const ConfigOption* wall_opt = mo->config.option("wall_filament");
if (wall_opt != nullptr)
obj_wall_extr = wall_opt->getInt();
if (obj_wall_extr != 1)
if (obj_wall_extr != 0)
plate_extruders.push_back(obj_wall_extr);
else if (glb_wall_extr != 1)
else if (glb_wall_extr != 0)
plate_extruders.push_back(glb_wall_extr);
int obj_sparse_infill_extr = 1;
int obj_sparse_infill_extr = 0;
const ConfigOption* sparse_infill_opt = mo->config.option("sparse_infill_filament");
if (sparse_infill_opt != nullptr)
obj_sparse_infill_extr = sparse_infill_opt->getInt();
if (obj_sparse_infill_extr != 1)
if (obj_sparse_infill_extr != 0)
plate_extruders.push_back(obj_sparse_infill_extr);
else if (glb_sparse_infill_extr != 1)
else if (glb_sparse_infill_extr != 0)
plate_extruders.push_back(glb_sparse_infill_extr);
int obj_solid_infill_extr = 1;
int obj_solid_infill_extr = 0;
const ConfigOption* solid_infill_opt = mo->config.option("solid_infill_filament");
if (solid_infill_opt != nullptr)
obj_solid_infill_extr = solid_infill_opt->getInt();
if (obj_solid_infill_extr != 1)
if (obj_solid_infill_extr != 0)
plate_extruders.push_back(obj_solid_infill_extr);
else if (glb_solid_infill_extr != 1)
else if (glb_solid_infill_extr != 0)
plate_extruders.push_back(glb_solid_infill_extr);
}
@@ -2812,31 +2812,31 @@ std::vector<int> PartPlate::get_extruders_under_cli(bool conside_custom_gcode, D
else if (glb_support_extr != 0)
plate_extruders.push_back(glb_support_extr);
int obj_wall_extr = 1;
int obj_wall_extr = 0;
const ConfigOption* wall_opt = object->config.option("wall_filament");
if (wall_opt != nullptr)
obj_wall_extr = wall_opt->getInt();
if (obj_wall_extr != 1)
if (obj_wall_extr != 0)
plate_extruders.push_back(obj_wall_extr);
else if (glb_wall_extr != 1)
else if (glb_wall_extr != 0)
plate_extruders.push_back(glb_wall_extr);
int obj_sparse_infill_extr = 1;
int obj_sparse_infill_extr = 0;
const ConfigOption* sparse_infill_opt = object->config.option("sparse_infill_filament");
if (sparse_infill_opt != nullptr)
obj_sparse_infill_extr = sparse_infill_opt->getInt();
if (obj_sparse_infill_extr != 1)
if (obj_sparse_infill_extr != 0)
plate_extruders.push_back(obj_sparse_infill_extr);
else if (glb_sparse_infill_extr != 1)
else if (glb_sparse_infill_extr != 0)
plate_extruders.push_back(glb_sparse_infill_extr);
int obj_solid_infill_extr = 1;
int obj_solid_infill_extr = 0;
const ConfigOption* solid_infill_opt = object->config.option("solid_infill_filament");
if (solid_infill_opt != nullptr)
obj_solid_infill_extr = solid_infill_opt->getInt();
if (obj_solid_infill_extr != 1)
if (obj_solid_infill_extr != 0)
plate_extruders.push_back(obj_solid_infill_extr);
else if (glb_solid_infill_extr != 1)
else if (glb_solid_infill_extr != 0)
plate_extruders.push_back(glb_solid_infill_extr);
}
}