FIX: check conflict when only have mutilcolor obj and wipetower
STUDIO-2789 Change-Id: Ic2cdd76416fc979b13f9c2fc9a29a5312b832caa (cherry picked from commit 47319cafa726983f66577209b2c58fd7ead304ee)
This commit is contained in:
parent
e6b8605091
commit
dcb1f68b89
|
@ -207,7 +207,7 @@ ConflictComputeOpt ConflictChecker::find_inter_of_lines(const LineWithIDs &lines
|
||||||
ConflictResultOpt ConflictChecker::find_inter_of_lines_in_diff_objs(PrintObjectPtrs objs,
|
ConflictResultOpt ConflictChecker::find_inter_of_lines_in_diff_objs(PrintObjectPtrs objs,
|
||||||
std::optional<const FakeWipeTower *> wtdptr) // find the first intersection point of lines in different objects
|
std::optional<const FakeWipeTower *> wtdptr) // find the first intersection point of lines in different objects
|
||||||
{
|
{
|
||||||
if (objs.size() <= 1) { return {}; }
|
if (objs.size() <= 1 && !wtdptr) { return {}; }
|
||||||
LinesBucketQueue conflictQueue;
|
LinesBucketQueue conflictQueue;
|
||||||
if (wtdptr.has_value()) { // wipe tower at 0 by default
|
if (wtdptr.has_value()) { // wipe tower at 0 by default
|
||||||
auto wtpaths = wtdptr.value()->getFakeExtrusionPathsFromWipeTower();
|
auto wtpaths = wtdptr.value()->getFakeExtrusionPathsFromWipeTower();
|
||||||
|
|
Loading…
Reference in New Issue