mirror of
https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git
synced 2025-08-14 06:45:56 +08:00
Merge branch 'tm_fix_shift_arrange_rebased_SPE-2071' into master_27x
This commit is contained in:
commit
9f52d0a481
@ -118,21 +118,13 @@ ArrangeTask<ArrItem>::process_native(Ctl &ctl)
|
|||||||
|
|
||||||
} subctl{ctl, *this};
|
} subctl{ctl, *this};
|
||||||
|
|
||||||
auto fixed_items = printable.unselected;
|
arranger->arrange(printable.selected, printable.unselected, bed, subctl);
|
||||||
|
|
||||||
// static (unselected) unprintable objects should not be overlapped by
|
|
||||||
// movable and printable objects
|
|
||||||
std::copy(unprintable.unselected.begin(),
|
|
||||||
unprintable.unselected.end(),
|
|
||||||
std::back_inserter(fixed_items));
|
|
||||||
|
|
||||||
arranger->arrange(printable.selected, fixed_items, bed, subctl);
|
|
||||||
|
|
||||||
std::vector<int> printable_bed_indices =
|
std::vector<int> printable_bed_indices =
|
||||||
get_bed_indices(crange(printable.selected), crange(printable.unselected));
|
get_bed_indices(crange(printable.selected), crange(printable.unselected));
|
||||||
|
|
||||||
// If there are no printables, leave the physical bed empty
|
// If there are no printables, leave the physical bed empty
|
||||||
constexpr int SearchFrom = 1;
|
static constexpr int SearchFrom = 1;
|
||||||
|
|
||||||
// Unprintable items should go to the first logical (!) bed not containing
|
// Unprintable items should go to the first logical (!) bed not containing
|
||||||
// any printable items
|
// any printable items
|
||||||
|
Loading…
x
Reference in New Issue
Block a user