Merge branch '2.5'

This commit is contained in:
Jack Ha 2017-03-22 09:44:47 +01:00
commit 72db7772f5

View File

@ -634,10 +634,6 @@ class BuildVolume(SceneNode):
prime_polygon = Polygon.approximatedCircle(PRIME_CLEARANCE) prime_polygon = Polygon.approximatedCircle(PRIME_CLEARANCE)
prime_polygon = prime_polygon.getMinkowskiHull(Polygon.approximatedCircle(border_size)) prime_polygon = prime_polygon.getMinkowskiHull(Polygon.approximatedCircle(border_size))
#prime_polygon2 = prime_polygon.translate(18, 0)
#prime_polygon = prime_polygon2.intersectionConvexHulls(prime_polygon)
prime_polygon = prime_polygon.translate(prime_x, prime_y) prime_polygon = prime_polygon.translate(prime_x, prime_y)
result[extruder.getId()] = [prime_polygon] result[extruder.getId()] = [prime_polygon]