Merge branch 'pppalain:master' into master

scripts/addons/cam/image_utils.py

@@ -1088,8 +1088,6 @@ def renderSampleImage(o):
             o.offset_image.fill(-10)
 
             # various settings for  faster render
-            r.tile_x = 1024  # ceil(resx/1024)
-            r.tile_y = 1024  # ceil(resy/1024)
             r.resolution_percentage = 100
 
             r.engine = 'BLENDER_EEVEE'

scripts/addons/cam/puzzle_joinery.py

@@ -720,13 +720,11 @@ def open_curve(line, thick, diameter, tolerance, amount=0, stem=1, twist=False,
 def tile(diameter, tolerance, tile_x_amount, tile_y_amount, stem=1):
     global DT
     diameter = diameter * DT
-    # diameter * DT * (2 + stem - 1)
-    (4 + 2 * (stem - 1)) * diameter
-    width = (tile_x_amount) * (4 + 2 * (stem - 1)) * diameter + diameter
-    height = (tile_y_amount) * (4 + 2 * (stem - 1)) * diameter + diameter
+    width = ((tile_x_amount) * (4 + 2 * (stem-1)) + 1) * diameter
+    height = ((tile_y_amount) * (4 + 2 * (stem - 1)) + 1) * diameter
 
     print('size:', width, height)
-    fingers(diameter, tolerance, amount=tile_x_amount+2, stem=stem)
+    fingers(diameter, tolerance, amount=tile_x_amount, stem=stem)
     simple.add_rectangle(width, height)
     simple.active_name('_base')
 

scripts/addons/cam/utils.py

@@ -1003,7 +1003,7 @@ def connectChunksLow(chunks, o):
 
 def getClosest(o, pos, chunks):
     # ch=-1
-    mind = 10000
+    mind = 2000
     d = 100000000000
     ch = None
     for chtest in chunks: