[Bf-blender-cvs] [29a28a87e43] master: Added a cast needed to shut up an error in last commit.

Howard Trickey noreply at git.blender.org
Mon Feb 22 04:12:42 CET 2021


Commit: 29a28a87e43da4d8727f574babad91d17e754fb5
Author: Howard Trickey
Date:   Sun Feb 21 22:11:59 2021 -0500
Branches: master
https://developer.blender.org/rB29a28a87e43da4d8727f574babad91d17e754fb5

Added a cast needed to shut up an error in last commit.

===================================================================

M	source/blender/blenkernel/intern/mesh_boolean_convert.cc

===================================================================

diff --git a/source/blender/blenkernel/intern/mesh_boolean_convert.cc b/source/blender/blenkernel/intern/mesh_boolean_convert.cc
index 807bb3534f6..b546550a85f 100644
--- a/source/blender/blenkernel/intern/mesh_boolean_convert.cc
+++ b/source/blender/blenkernel/intern/mesh_boolean_convert.cc
@@ -578,7 +578,7 @@ static void copy_or_interp_loop_attributes(Mesh *dest_mesh,
      * At this point we cannot yet calculate the interpolation weights, as they depend on
      * the coordinate where interpolation is to happen, but we can allocate the needed arrays,
      * so they don't have to be allocated per-layer. */
-    cos_2d = BLI_array_alloca(cos_2d, orig_mp->totloop);
+    cos_2d = (float(*)[2])BLI_array_alloca(cos_2d, orig_mp->totloop);
     weights = Array<float>(orig_mp->totloop);
     src_blocks_ofs = Array<const void *>(orig_mp->totloop);
     get_poly2d_cos(orig_me, orig_mp, cos_2d, mim.to_obj0[orig_me_index], axis_mat);



More information about the Bf-blender-cvs mailing list