[Bf-blender-cvs] [b4536d274ce] temp_bmesh_multires: Forgot to increase array size for data transfer modifier struct.

[Joseph Eagar]

Commit: b4536d274ce1b944792024f4e1492a37341106b8
Author: Joseph Eagar
Date:   Mon Apr 5 21:24:38 2021 -0700
Branches: temp_bmesh_multires
https://developer.blender.org/rBb4536d274ce1b944792024f4e1492a37341106b8

Forgot to increase array size for data transfer modifier struct.

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

M	source/blender/makesdna/DNA_modifier_types.h
M	source/blender/modifiers/intern/MOD_boolean.cc

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

diff --git a/source/blender/makesdna/DNA_modifier_types.h b/source/blender/makesdna/DNA_modifier_types.h
index 37d128501ee..df35b9e849a 100644
--- a/source/blender/makesdna/DNA_modifier_types.h
+++ b/source/blender/makesdna/DNA_modifier_types.h
@@ -2051,9 +2051,9 @@ typedef struct DataTransferModifierData {
   char _pad1[4];
 
   /** DT_MULTILAYER_INDEX_MAX; See DT_FROMLAYERS_ enum in ED_object.h. */
-  int layers_select_src[4];
+  int layers_select_src[5];
   /** DT_MULTILAYER_INDEX_MAX; See DT_TOLAYERS_ enum in ED_object.h. */
-  int layers_select_dst[4];
+  int layers_select_dst[5];
 
   /** See CDT_MIX_ enum in BKE_customdata.h. */
   int mix_mode;
diff --git a/source/blender/modifiers/intern/MOD_boolean.cc b/source/blender/modifiers/intern/MOD_boolean.cc
index c49bcce2dd3..88ad6780037 100644
--- a/source/blender/modifiers/intern/MOD_boolean.cc
+++ b/source/blender/modifiers/intern/MOD_boolean.cc
@@ -256,7 +256,7 @@ static BMesh *BMD_mesh_bm_create(
 
   BMeshFromMeshParams params{};
   params.calc_face_normal = true;
-  BM_mesh_bm_from_me(bm, mesh_operand_ob, &params);
+  BM_mesh_bm_from_me(object, bm, mesh_operand_ob, &params);
 
   if (UNLIKELY(*r_is_flip)) {
     const int cd_loop_mdisp_offset = CustomData_get_offset(&bm->ldata, CD_MDISPS);
@@ -267,7 +267,7 @@ static BMesh *BMD_mesh_bm_create(
     }
   }
 
-  BM_mesh_bm_from_me(bm, mesh, &params);
+  BM_mesh_bm_from_me(object, bm, mesh, &params);
 
   return bm;
 }
@@ -544,7 +544,7 @@ static Mesh *modifyMesh(ModifierData *md, const ModifierEvalContext *ctx, Mesh *
           /* Needed for multiple objects to work. */
           BMeshToMeshParams params{};
           params.calc_object_remap = false;
-          BM_mesh_bm_to_me(nullptr, bm, mesh, &params);
+          BM_mesh_bm_to_me(nullptr, nullptr, bm, mesh, &params);
 
           result = BKE_mesh_from_bmesh_for_eval_nomain(bm, nullptr, mesh);
           BM_mesh_free(bm);