Unverified Commit 729c796d authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

Merge pull request #227849 from SuperSandro2000/blender-numpy

parents 3dcff817 0313eb47
Loading
Loading
Loading
Loading
+14 −0
Original line number Diff line number Diff line
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)
+4 −1
Original line number Diff line number Diff line
@@ -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 ];