Browse Source

Fix remaining merge conflict

Must've done something wrong? No, it's they who are wrong!

Contributes to issue CURA-2407.
Ghostkeeper 8 years ago
parent
commit
608c442bb9
1 changed files with 2 additions and 2 deletions
  1. 2 2
      cura/BuildVolume.py

+ 2 - 2
cura/BuildVolume.py

@@ -364,7 +364,7 @@ class BuildVolume(SceneNode):
                 poly = Polygon(numpy.array(area, numpy.float32))
                 poly = Polygon(numpy.array(area, numpy.float32))
 
 
                 # Minkowski with zero, to ensure that the polygon is correct & watertight.
                 # 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)
                 disallowed_polygons.append(poly)
 
 
             extruder_manager = ExtruderManager.getInstance()
             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_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
                 prime_tower_collision = False
 
 
                 # Check if prime polygon is intersecting with any of the other disallowed areas.
                 # Check if prime polygon is intersecting with any of the other disallowed areas.