juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-22 12:45:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into feature/orca_network_refactor

Browse Source
This commit is contained in:
SoftFever
2026-01-27 20:59:07 +08:00
committed by GitHub
parent 9233005725 b9ada2542a
commit 570d0ec7b6
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libslic3r/Print.cpp
View File

@@ -1194,7 +1194,7 @@ StringObjectException Print::validate(StringObjectException *warning, Polygons*
}
}
if (m_config.print_sequence == PrintSequence::ByObject && m_objects.size() > 1) {
if (m_config.print_sequence == PrintSequence::ByObject && (m_objects.size() > 1 || m_objects[0]->instances().size() > 1)) {
if (m_config.timelapse_type == TimelapseType::tlSmooth)
return {L("Smooth mode of timelapse is not supported when \"by object\" sequence is enabled.")};

6
src/libslic3r/Slicing.cpp
View File

@@ -260,7 +260,7 @@ std::vector<double> layer_height_profile_adaptive(const SlicingParameters& slici
// last facet visited by the as.next_layer_height() function, where the facets are sorted by their increasing Z span.
size_t current_facet = 0;
// loop until we have at least one layer and the max slice_z reaches the object height
while (print_z + EPSILON < slicing_params.object_print_z_height()) {
while (print_z + EPSILON < slicing_params.object_print_z_uncompensated_height()) {
float height = slicing_params.max_layer_height;
// Slic3r::debugf "\n Slice layer: %d\n", $id;
// determine next layer height
@@ -331,10 +331,10 @@ std::vector<double> layer_height_profile_adaptive(const SlicingParameters& slici
print_z += height;
}
double z_gap = slicing_params.object_print_z_height() - *(layer_height_profile.end() - 2);
double z_gap = slicing_params.object_print_z_uncompensated_height() - *(layer_height_profile.end() - 2);
if (z_gap > 0.0)
{
layer_height_profile.push_back(slicing_params.object_print_z_height());
layer_height_profile.push_back(slicing_params.object_print_z_uncompensated_height());
layer_height_profile.push_back(std::clamp(z_gap, slicing_params.min_layer_height, slicing_params.max_layer_height));
}