Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

bl_info bug #270

Merged
merged 4 commits into from
Aug 20, 2024
Merged

bl_info bug #270

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bc456cc
fixed numpy 2.0 errors in basrelief. numpy.float now is numpy.float64
pppalain Aug 14, 2024
b7df073
Merge remote-tracking branch 'origin/master'
pppalain Aug 14, 2024
5a8ae8a
remove bogus newline from bl_info
Invader-Zim Aug 20, 2024
7739dbd
Merge pull request #167 from Invader-Zim/stephen/fix_bl_info
pppalain Aug 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion scripts/addons/cam/__init__.py
View file
Open in desktop
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
View file
Open in desktop
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
Loading