From bc456cc648b317ded746cfb3f5dac9ff4a74d2f9 Mon Sep 17 00:00:00 2001 From: palain Date: Wed, 14 Aug 2024 13:41:01 -0300 Subject: [PATCH 1/2] fixed numpy 2.0 errors in basrelief. numpy.float now is numpy.float64 --- scripts/addons/cam/basrelief.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/addons/cam/basrelief.py b/scripts/addons/cam/basrelief.py index 2554ce2ab..ae5c4b15c 100644 --- a/scripts/addons/cam/basrelief.py +++ b/scripts/addons/cam/basrelief.py @@ -301,7 +301,7 @@ def solve_pde_multigrid(F, U, vcycleiterations, linbcgiterations, smoothiteratio IU.append(None) VF.append(None) PLANAR.append(None) - VF[0] = numpy.zeros((xmax, ymax), dtype=numpy.float) + VF[0] = numpy.zeros((xmax, ymax), dtype=numpy.float64) # numpy.fill(pix)!? TODO RHS[0] = F.copy() @@ -315,10 +315,10 @@ def solve_pde_multigrid(F, U, vcycleiterations, linbcgiterations, smoothiteratio # calculate size of next level sx = int(sx/2) sy = int(sy/2) - PLANAR[k+1] = numpy.zeros((sx, sy), dtype=numpy.float) - RHS[k+1] = numpy.zeros((sx, sy), dtype=numpy.float) - IU[k+1] = numpy.zeros((sx, sy), dtype=numpy.float) - VF[k+1] = numpy.zeros((sx, sy), dtype=numpy.float) + PLANAR[k+1] = numpy.zeros((sx, sy), dtype=numpy.float64) + RHS[k+1] = numpy.zeros((sx, sy), dtype=numpy.float64) + IU[k+1] = numpy.zeros((sx, sy), dtype=numpy.float64) + VF[k+1] = numpy.zeros((sx, sy), dtype=numpy.float64) # restrict from level k to level k+1 (coarser-grid) restrictbuf(PLANAR[k], PLANAR[k+1]) @@ -600,7 +600,7 @@ def imagetonumpy(i): x = 0 y = 0 count = 0 - na = numpy.array((0.1), dtype=float) + na = numpy.array((0.1), dtype=float64) size = width*height na.resize(size*4) From 5a8ae8aa4bec766bcf42f4e140398f834f9d0b6f Mon Sep 17 00:00:00 2001 From: Stephen Rakonza Date: Mon, 19 Aug 2024 23:15:19 -0700 Subject: [PATCH 2/2] remove bogus newline from bl_info --- scripts/addons/cam/__init__.py | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/addons/cam/__init__.py b/scripts/addons/cam/__init__.py index c618c71a1..cef0c615b 100644 --- a/scripts/addons/cam/__init__.py +++ b/scripts/addons/cam/__init__.py @@ -184,7 +184,6 @@ "name": "BlenderCAM - G-code Generation Tools", "author": "Vilem Novak & Contributors", "version":(1,0,26), - "blender": (3, 6, 0), "location": "Properties > render", "description": "Generate Machining Paths for CNC",