From 09d4f083e0f712779d77efaca9a7ed058f0ce182 Mon Sep 17 00:00:00 2001
From: Erwan MATHIEU <erwan.mathieu@ultimaker.com>
Date: Thu, 24 Aug 2023 11:15:34 +0200
Subject: [PATCH 1/2] Include adhesion for 1-at-a-time exclusion shadow

CURA-10307
---
 cura/Scene/ConvexHullDecorator.py | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/cura/Scene/ConvexHullDecorator.py b/cura/Scene/ConvexHullDecorator.py
index 06ec247ae4..0dbf3ba782 100644
--- a/cura/Scene/ConvexHullDecorator.py
+++ b/cura/Scene/ConvexHullDecorator.py
@@ -111,11 +111,7 @@ class ConvexHullDecorator(SceneNodeDecorator):
 
         # Parent can be None if node is just loaded.
         if self._isSingularOneAtATimeNode():
-            hull = self.getConvexHullHeadFull()
-            if hull is None:
-                return None
-            hull = self._add2DAdhesionMargin(hull)
-            return hull
+            return self.getConvexHullHeadFull()
 
         return self._compute2DConvexHull()
 
@@ -323,6 +319,7 @@ class ConvexHullDecorator(SceneNodeDecorator):
 
     def _compute2DConvexHeadFull(self) -> Optional[Polygon]:
         convex_hull = self._compute2DConvexHull()
+        convex_hull = self._add2DAdhesionMargin(convex_hull)
         if convex_hull:
             return convex_hull.getMinkowskiHull(self._getHeadAndFans())
         return None

From eee1eb714b9376694f8542de5ecf3dba1ee045d5 Mon Sep 17 00:00:00 2001
From: Erwan MATHIEU <erwan.mathieu@ultimaker.com>
Date: Thu, 24 Aug 2023 11:17:21 +0200
Subject: [PATCH 2/2] Fixed TiZYX machines head polygon definition

---
 resources/definitions/tizyx_evy.def.json      | 2 +-
 resources/definitions/tizyx_evy_dual.def.json | 2 +-
 resources/definitions/tizyx_k25.def.json      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/resources/definitions/tizyx_evy.def.json b/resources/definitions/tizyx_evy.def.json
index 41b2b982be..7ae10f5f1d 100644
--- a/resources/definitions/tizyx_evy.def.json
+++ b/resources/definitions/tizyx_evy.def.json
@@ -57,7 +57,7 @@
                 [25, 49],
                 [25, -49],
                 [-25, -49],
-                [25, 49]
+                [-25, 49]
             ]
         },
         "machine_heated_bed": { "default_value": true },
diff --git a/resources/definitions/tizyx_evy_dual.def.json b/resources/definitions/tizyx_evy_dual.def.json
index 22046a16ff..7ef3aff2ab 100644
--- a/resources/definitions/tizyx_evy_dual.def.json
+++ b/resources/definitions/tizyx_evy_dual.def.json
@@ -54,7 +54,7 @@
                 [25, 49],
                 [25, -49],
                 [-25, -49],
-                [25, 49]
+                [-25, 49]
             ]
         },
         "machine_heated_bed": { "default_value": true },
diff --git a/resources/definitions/tizyx_k25.def.json b/resources/definitions/tizyx_k25.def.json
index 60005e8712..fbae8a657d 100644
--- a/resources/definitions/tizyx_k25.def.json
+++ b/resources/definitions/tizyx_k25.def.json
@@ -51,7 +51,7 @@
                 [25, 49],
                 [25, -49],
                 [-25, -49],
-                [25, 49]
+                [-25, 49]
             ]
         },
         "machine_heated_bed": { "default_value": true },