From 5ed7d0aa29efbc25865839c8ee435109c2b0b677 Mon Sep 17 00:00:00 2001 From: tamasmeszaros Date: Mon, 16 Mar 2020 14:37:54 +0100 Subject: [PATCH] Fix arrangement with items larger or equal to bed dimesions. fixes #2897 fixes #1186 --- .../include/libnest2d/selections/selection_boilerplate.hpp | 5 ++++- src/libslic3r/Arrange.cpp | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/libnest2d/include/libnest2d/selections/selection_boilerplate.hpp b/src/libnest2d/include/libnest2d/selections/selection_boilerplate.hpp index 8e65bafe9..e96378296 100644 --- a/src/libnest2d/include/libnest2d/selections/selection_boilerplate.hpp +++ b/src/libnest2d/include/libnest2d/selections/selection_boilerplate.hpp @@ -43,7 +43,10 @@ protected: Placer p{bin}; p.configure(pcfg); - if (itm.area() <= 0 || !p.pack(cpy)) it = c.erase(it); + if (itm.area() <= 0 || !p.pack(cpy)) { + static_cast(*it).binId(BIN_ID_UNSET); + it = c.erase(it); + } else it++; } } diff --git a/src/libslic3r/Arrange.cpp b/src/libslic3r/Arrange.cpp index 3fa7e1841..b8ef0bcdc 100644 --- a/src/libslic3r/Arrange.cpp +++ b/src/libslic3r/Arrange.cpp @@ -577,7 +577,7 @@ void _arrange( std::function stopfn) { // Integer ceiling the min distance from the bed perimeters - coord_t md = minobjd - 2 * scaled(0.1 + EPSILON); + coord_t md = minobjd; md = (md % 2) ? md / 2 + 1 : md / 2; auto corrected_bin = bin;