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

Merge remote-tracking branch 'upstream/main' into dev/h2d-2

Browse source 
# Conflicts:
#	src/slic3r/GUI/Tab.cpp
This commit is contained in:
Noisyfox 2025-09-24 09:15:33 +08:00
commit 580414265d
261 changed files with 9126 additions and 1172 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/libslic3r/GCodeWriter.cpp
View file

@ -637,12 +637,12 @@ std::string GCodeWriter::travel_to_xyz(const Vec3d &point, const std::string &co
return out_string;
}
std::string GCodeWriter::travel_to_z(double z, const std::string &comment)
std::string GCodeWriter::travel_to_z(double z, const std::string &comment, bool force)
{
/* If target Z is lower than current Z but higher than nominal Z
we don't perform the move but we only adjust the nominal Z by
reducing the lift amount that will be used for unlift. */
if (!this->will_move_z(z)) {
if (!force && !this->will_move_z(z)) {
double nominal_z = m_pos(2) - m_lifted;
m_lifted -= (z - nominal_z);
if (std::abs(m_lifted) < EPSILON)