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

# Conflicts:
#	src/slic3r/GUI/Tab.cpp
This commit is contained in:
Noisyfox
2025-09-24 09:15:33 +08:00
261 changed files with 9126 additions and 1172 deletions

View File

@@ -501,7 +501,7 @@ void PartPlate::calc_gridlines(const ExPolygon& poly, const BoundingBox& pp_bbox
// calculate and generate grid
int step = Bed_2D::calculate_grid_step(pp_bbox, scale_(1.00));
Vec2d scaled_origin = Vec2d(scale_(m_origin.x()),scale_(m_origin.x()));
Vec2d scaled_origin = Vec2d(scale_(m_origin.x()),scale_(m_origin.y()));
auto grid_lines = Bed_2D::generate_grid(poly, pp_bbox, scaled_origin, scale_(step), SCALED_EPSILON);
Lines lines_thin = to_lines(grid_lines[0]);