b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

blender 3.4.1 -> 3.5.1 (#229570)

Browse source
This commit is contained in:
Pauan 2023-05-04 08:02:14 +02:00 committed by GitHub
parent 58f8ca5fd4
commit 8c32a5b2ce
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,14 +0,0 @@
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)

9
pkgs/applications/misc/blender/default.nix
View file

@ -27,17 +27,14 @@ let
in
stdenv.mkDerivation rec {
pname = "blender";
version = "3.4.1";
version = "3.5.1";
src = fetchurl {
url = "https://download.blender.org/source/${pname}-${version}.tar.xz";
hash = "sha256-JHxMEignDJAQ9HIcmFy1tiirUKvPnyZ4Ywc3FC7rkcM=";
hash = "sha256-vXQox+bLpakAIWJpwyER3/qrrxvbVHLyMZZeYVF0qAk=";
};
patches = [
# remove with 3.5.X
./blender-numpy.patch
] ++ lib.optional stdenv.isDarwin ./darwin.patch;
patches = lib.optional stdenv.isDarwin ./darwin.patch;
nativeBuildInputs = [ cmake makeWrapper python310Packages.wrapPython llvmPackages.llvm.dev ]
++ lib.optionals cudaSupport [ addOpenGLRunpath ];