blender 3.4.1 -> 3.5.1 (#229570)

authored by Pauan and committed by GitHub 8c32a5b2 58f8ca5f

+3 -20
-14
pkgs/applications/misc/blender/blender-numpy.patch
··· 1 - 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 2 - index 41dd4d03..a97f9d38 100755 3 - --- a/release/scripts/addons/io_scene_gltf2/blender/imp/gltf2_blender_mesh.py 4 - +++ b/release/scripts/addons/io_scene_gltf2/blender/imp/gltf2_blender_mesh.py 5 - @@ -572,7 +572,7 @@ def set_poly_smoothing(gltf, pymesh, mesh, vert_normals, loop_vidxs): 6 - # Try to guess which polys should be flat based on the fact that all the 7 - # loop normals for a flat poly are = the poly's normal. 8 - 9 - - poly_smooths = np.empty(num_polys, dtype=np.bool) 10 - + poly_smooths = np.empty(num_polys, dtype=np.bool_) 11 - 12 - poly_normals = np.empty(num_polys * 3, dtype=np.float32) 13 - mesh.polygons.foreach_get('normal', poly_normals) 14 -
+3 -6
pkgs/applications/misc/blender/default.nix
··· 27 27 in 28 28 stdenv.mkDerivation rec { 29 29 pname = "blender"; 30 - version = "3.4.1"; 30 + version = "3.5.1"; 31 31 32 32 src = fetchurl { 33 33 url = "https://download.blender.org/source/${pname}-${version}.tar.xz"; 34 - hash = "sha256-JHxMEignDJAQ9HIcmFy1tiirUKvPnyZ4Ywc3FC7rkcM="; 34 + hash = "sha256-vXQox+bLpakAIWJpwyER3/qrrxvbVHLyMZZeYVF0qAk="; 35 35 }; 36 36 37 - patches = [ 38 - # remove with 3.5.X 39 - ./blender-numpy.patch 40 - ] ++ lib.optional stdenv.isDarwin ./darwin.patch; 37 + patches = lib.optional stdenv.isDarwin ./darwin.patch; 41 38 42 39 nativeBuildInputs = [ cmake makeWrapper python310Packages.wrapPython llvmPackages.llvm.dev ] 43 40 ++ lib.optionals cudaSupport [ addOpenGLRunpath ];