juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-14 09:02:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/main' into libvgcode

Browse Source 
# Conflicts:
#	src/libslic3r/GCode/GCodeProcessor.cpp
This commit is contained in:
Andrew Sun
2025-11-18 19:53:58 -05:00
parent a87df7f0b5 aa5350a6fe
commit e4d354b673
1153 changed files with 385954 additions and 2728 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/libslic3r/GCode/GCodeProcessor.cpp
View File

@@ -2478,6 +2478,13 @@ void GCodeProcessor::process_file(const std::string& filename, std::function<voi
// thus a probability of incorrect substitution is low and the G-code viewer is a consumer-only anyways.
config.load_from_gcode_file(filename, ForwardCompatibilitySubstitutionRule::EnableSilent);
// Get the correct printer vendor based on the `printer_model` field
auto printer_model_opt = config.opt<ConfigOptionString>("printer_model");
if (printer_model_opt && !printer_model_opt->value.empty()) {
// TODO: Orca hack, proper vendor check?
GCodeProcessor::s_IsBBLPrinter = boost::starts_with(printer_model_opt->value, "Bambu Lab");
}
ConfigOptionStrings *filament_color = config.opt<ConfigOptionStrings>("filament_colour");
ConfigOptionInts *filament_map = config.opt<ConfigOptionInts>("filament_map", true);
if (filament_color && filament_color->size() != filament_map->size()) {
@@ -2554,6 +2561,8 @@ void GCodeProcessor::finalize(bool post_process)
update_estimated_times_stats();
m_result.initial_layer_time = get_first_layer_time(PrintEstimatedStatistics::ETimeMode::Normal);
if (post_process){
run_post_process();
}