Skip to content

Commit

Permalink
Merge pull request vilemduha#270 from pppalain/master
Browse files Browse the repository at this point in the history
bl_info bug
  • Loading branch information
pppalain authored Aug 20, 2024
2 parents 42ca07d + 7739dbd commit d8fed9b
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 7 deletions.
1 change: 0 additions & 1 deletion scripts/addons/cam/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
12 changes: 6 additions & 6 deletions scripts/addons/cam/basrelief.py
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand All @@ -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])
Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit d8fed9b

Please sign in to comment.