From 608c442bb9afce9de32bf551012c2c33e9cb2646 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Wed, 28 Sep 2016 11:53:03 +0200 Subject: [PATCH] Fix remaining merge conflict Must've done something wrong? No, it's they who are wrong! Contributes to issue CURA-2407. --- cura/BuildVolume.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cura/BuildVolume.py b/cura/BuildVolume.py index 257f3cc8f5..36136eb441 100644 --- a/cura/BuildVolume.py +++ b/cura/BuildVolume.py @@ -364,7 +364,7 @@ class BuildVolume(SceneNode): poly = Polygon(numpy.array(area, numpy.float32)) # Minkowski with zero, to ensure that the polygon is correct & watertight. - poly = poly.getMinkowskiHull(Polygon(approximatedCircleVertices(0))) + poly = poly.getMinkowskiHull(Polygon.approximatedCircle(0)) disallowed_polygons.append(poly) extruder_manager = ExtruderManager.getInstance() @@ -385,7 +385,7 @@ class BuildVolume(SceneNode): [prime_x + PRIME_CLEARANCE, prime_y + PRIME_CLEARANCE], [prime_x - PRIME_CLEARANCE, prime_y + PRIME_CLEARANCE], ]) - prime_polygon = prime_polygon.getMinkowskiHull(Polygon(approximatedCircleVertices(0))) + prime_polygon = prime_polygon.getMinkowskiHull(Polygon.approximatedCircle(0)) prime_tower_collision = False # Check if prime polygon is intersecting with any of the other disallowed areas.