nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-02 07:31:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

blender: patch removed numpy attribute

Browse Source
This commit is contained in:
Sandro Jäckel 2023-04-23 20:07:00 +02:00
parent d895ea0363
commit 0313eb4795
No known key found for this signature in database
GPG Key ID: 3AF5A43A3EECC2E5
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/applications/misc/blender/blender-numpy.patch Normal file
View File

@ -0,0 +1,14 @@
diff --git a/release/scripts/addons/io_scene_gltf2/blender/imp/gltf2_blender_mesh.py b/release/scripts/addons/io_scene_gltf2/blender/imp/gltf2_blender_mesh.py
index 41dd4d03..a97f9d38 100755
--- a/release/scripts/addons/io_scene_gltf2/blender/imp/gltf2_blender_mesh.py
+++ b/release/scripts/addons/io_scene_gltf2/blender/imp/gltf2_blender_mesh.py
@@ -572,7 +572,7 @@ def set_poly_smoothing(gltf, pymesh, mesh, vert_normals, loop_vidxs):
# Try to guess which polys should be flat based on the fact that all the
# loop normals for a flat poly are = the poly's normal.
- poly_smooths = np.empty(num_polys, dtype=np.bool)
+ poly_smooths = np.empty(num_polys, dtype=np.bool_)
poly_normals = np.empty(num_polys * 3, dtype=np.float32)
mesh.polygons.foreach_get('normal', poly_normals)

5
pkgs/applications/misc/blender/default.nix
View File

@ -34,7 +34,10 @@ stdenv.mkDerivation rec {
hash = "sha256-JHxMEignDJAQ9HIcmFy1tiirUKvPnyZ4Ywc3FC7rkcM=";
};
patches = lib.optional stdenv.isDarwin ./darwin.patch;
patches = [
# remove with 3.5.X
./blender-numpy.patch
] ++ lib.optional stdenv.isDarwin ./darwin.patch;
nativeBuildInputs = [ cmake makeWrapper python310Packages.wrapPython llvmPackages.llvm.dev ]
++ lib.optionals cudaSupport [ addOpenGLRunpath ];