Merge branch '2.1'

* 2.1:
  Do not round convex hull points to nearest int
  Use fdmprinter.json If we have no active machine instead of returning None
  JSON fix: max value of infill_sparse_thickness based on engine MAX_COMBINE_COUNT hardcoded value (CURA-1374)
This commit is contained in:
Arjen Hiemstra 2016-04-11 15:40:36 +02:00
commit d5bf9b3733
2 changed files with 6 additions and 3 deletions

View file

@ -42,7 +42,7 @@ class ConvexHullJob(Job):
# Don't use data below 0.
# TODO; We need a better check for this as this gives poor results for meshes with long edges.
vertex_data = vertex_data[vertex_data[:,1] >= 0]
hull = Polygon(numpy.rint(vertex_data[:, [0, 2]]).astype(int))
hull = Polygon(vertex_data[:, [0, 2]])
# First, calculate the normal convex hull around the points
hull = hull.getConvexHull()