3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2026-01-28 11:50:49 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Merge remote-tracking branch 'refs/remotes/SoftFever/main' into enh-spoolman-support

Browse source 
# Conflicts:
#	src/slic3r/GUI/PhysicalPrinterDialog.cpp
This commit is contained in:
Ocraftyone 2024-06-22 03:32:03 -04:00
commit 6659208cf0
No known key found for this signature in database
GPG key ID: 85836ED21AD4D125
639 changed files with 24359 additions and 6664 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/libslic3r/GCode.cpp
View file

@ -1398,6 +1398,8 @@ namespace DoExport {
total_cost += weight * extruder->filament_cost() * 0.001;
}
total_cost += config.time_cost.getFloat() * (normal_print_time/3600.0);
print_statistics.total_extruded_volume = total_extruded_volume;
print_statistics.total_used_filament = total_used_filament;
print_statistics.total_weight = total_weight;
@ -4140,7 +4142,7 @@ LayerResult GCode::process_layer(
}
// BBS
if (print.config().print_sequence == PrintSequence::ByObject && prime_extruder && first_layer && extruder_id == first_extruder_id) {
if (print.has_skirt() && print.config().print_sequence == PrintSequence::ByObject && prime_extruder && first_layer && extruder_id == first_extruder_id) {
for (InstanceToPrint& instance_to_print : instances_to_print) {
if (this->m_objSupportsWithBrim.find(instance_to_print.print_object.id()) != this->m_objSupportsWithBrim.end() &&
print.m_supportBrimMap.at(instance_to_print.print_object.id()).entities.size() > 0)