Modifier: use simplified bmesh -> mesh conversion

16 files changed, 17 insertions, 22 deletions

diff --git a/source/blender/alembic/intern/abc_mesh.cc b/source/blender/alembic/intern/abc_mesh.cc
index 556bbd3be76..4c48b7a5bce 100644
--- a/source/blender/alembic/intern/abc_mesh.cc
+++ b/source/blender/alembic/intern/abc_mesh.cc
@@ -546,8 +546,7 @@ Mesh *AbcMeshWriter::getFinalMesh(bool &r_needsfree)
 
 		BM_mesh_triangulate(bm, quad_method, ngon_method, tag_only, NULL, NULL, NULL);
 
-		struct BMeshToMeshParams bmmp = {0};
-		Mesh *result = BKE_mesh_from_bmesh_nomain(bm, &bmmp);
+		Mesh *result = BKE_mesh_from_bmesh_for_eval_nomain(bm, 0);
 		BM_mesh_free(bm);
 
 		mesh = result;
diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c
index 63853e9fcca..38d614acc33 100644
--- a/source/blender/blenkernel/intern/DerivedMesh.c
+++ b/source/blender/blenkernel/intern/DerivedMesh.c
@@ -1202,7 +1202,7 @@ static Mesh *create_orco_mesh(Object *ob, Mesh *me, BMEditMesh *em, int layer)
 	int free;
 
 	if (em) {
-		mesh = BKE_mesh_from_bmesh_nomain(em->bm, &(struct BMeshToMeshParams){0});
+		mesh = BKE_mesh_from_bmesh_for_eval_nomain(em->bm, 0);
 	}
 	else {
 		mesh = BKE_mesh_copy_for_eval(me, true);
@@ -2016,7 +2016,7 @@ static void editbmesh_calc_modifiers(
 
 			}
 			else {
-				me = BKE_mesh_from_bmesh_nomain(em->bm, &(struct BMeshToMeshParams){0});
+				me = BKE_mesh_from_bmesh_for_eval_nomain(em->bm, 0);
 				ASSERT_IS_VALID_MESH(me);
 
 				if (deformedVerts) {
diff --git a/source/blender/blenkernel/intern/mesh.c b/source/blender/blenkernel/intern/mesh.c
index a753a996e0a..ff8c0076f7b 100644
--- a/source/blender/blenkernel/intern/mesh.c
+++ b/source/blender/blenkernel/intern/mesh.c
@@ -769,11 +769,7 @@ Mesh *BKE_mesh_from_bmesh_for_eval_nomain(BMesh *bm, const int64_t cd_mask_extra
 Mesh *BKE_mesh_from_editmesh_with_coords_thin_wrap(
         BMEditMesh *em, CustomDataMask data_mask, float (*vertexCos)[3])
 {
-	Mesh *me = BKE_mesh_from_bmesh_nomain(
-	        em->bm,
-	        &(struct BMeshToMeshParams){
-	            .cd_mask_extra = data_mask,
-	        });
+	Mesh *me = BKE_mesh_from_bmesh_for_eval_nomain(em->bm, data_mask);
 	if (vertexCos) {
 		/* We will own this array in the future. */
 		BKE_mesh_apply_vert_coords(me, vertexCos);
diff --git a/source/blender/blenkernel/intern/modifier.c b/source/blender/blenkernel/intern/modifier.c
index cec49080736..558d1537028 100644
--- a/source/blender/blenkernel/intern/modifier.c
+++ b/source/blender/blenkernel/intern/modifier.c
@@ -1094,7 +1094,7 @@ Mesh *BKE_modifier_get_evaluated_mesh_from_evaluated_object(Object *ob_eval, boo
 		/* Note: currently we have no equivalent to derived cagemesh or even final dm in BMEditMesh...
 		 * This is TODO in core depsgraph/modifier stack code still. */
 		BMEditMesh *em = BKE_editmesh_from_object(ob_eval);
-		me = BKE_mesh_from_bmesh_nomain(em->bm, &(struct BMeshToMeshParams){0});
+		me = BKE_mesh_from_bmesh_for_eval_nomain(em->bm, 0);
 		*r_free_mesh = true;
 	}
 	else {
diff --git a/source/blender/modifiers/intern/MOD_bevel.c b/source/blender/modifiers/intern/MOD_bevel.c
index 149e37e543a..c071559bffe 100644
--- a/source/blender/modifiers/intern/MOD_bevel.c
+++ b/source/blender/modifiers/intern/MOD_bevel.c
@@ -448,7 +448,7 @@ static Mesh *applyModifier(ModifierData *md, const ModifierEvalContext *ctx, Mes
 	if (set_wn_strength)
 		bevel_set_weighted_normal_face_strength(bm, scene);
 
-	result = BKE_mesh_from_bmesh_nomain(bm, &(struct BMeshToMeshParams){0});
+	result = BKE_mesh_from_bmesh_for_eval_nomain(bm, 0);
 
 	BLI_assert(bm->vtoolflagpool == NULL &&
 	           bm->etoolflagpool == NULL &&
diff --git a/source/blender/modifiers/intern/MOD_boolean.c b/source/blender/modifiers/intern/MOD_boolean.c
index a1bb788583e..8619b4e020c 100644
--- a/source/blender/modifiers/intern/MOD_boolean.c
+++ b/source/blender/modifiers/intern/MOD_boolean.c
@@ -317,7 +317,7 @@ static Mesh *applyModifier(ModifierData *md, const ModifierEvalContext *ctx, Mes
 				MEM_freeN(looptris);
 			}
 
-			result = BKE_mesh_from_bmesh_nomain(bm, &((struct BMeshToMeshParams){0}));
+			result = BKE_mesh_from_bmesh_for_eval_nomain(bm, 0);
 
 			BM_mesh_free(bm);
 
diff --git a/source/blender/modifiers/intern/MOD_decimate.c b/source/blender/modifiers/intern/MOD_decimate.c
index 49429b26fe4..7af25a048f8 100644
--- a/source/blender/modifiers/intern/MOD_decimate.c
+++ b/source/blender/modifiers/intern/MOD_decimate.c
@@ -186,7 +186,7 @@ static Mesh *applyModifier(
 
 	/* update for display only */
 	dmd->face_count = bm->totface;
-	result = BKE_mesh_from_bmesh_nomain(bm, &((struct BMeshToMeshParams){0}));
+	result = BKE_mesh_from_bmesh_for_eval_nomain(bm, 0);
 	BLI_assert(bm->vtoolflagpool == NULL &&
 	           bm->etoolflagpool == NULL &&
 	           bm->ftoolflagpool == NULL);  /* make sure we never alloc'd these */
diff --git a/source/blender/modifiers/intern/MOD_edgesplit.c b/source/blender/modifiers/intern/MOD_edgesplit.c
index 8c23ce7e34c..58cbbbc7b4d 100644
--- a/source/blender/modifiers/intern/MOD_edgesplit.c
+++ b/source/blender/modifiers/intern/MOD_edgesplit.c
@@ -106,7 +106,7 @@ static Mesh *doEdgeSplit(Mesh *mesh, EdgeSplitModifierData *emd, const ModifierE
 
 	/* BM_mesh_validate(bm); */ /* for troubleshooting */
 
-	result = BKE_mesh_from_bmesh_nomain(bm, &((struct BMeshToMeshParams){0}));
+	result = BKE_mesh_from_bmesh_for_eval_nomain(bm, 0);
 	BM_mesh_free(bm);
 
 	result->runtime.cd_dirty_vert |= CD_MASK_NORMAL;
diff --git a/source/blender/modifiers/intern/MOD_particlesystem.c b/source/blender/modifiers/intern/MOD_particlesystem.c
index d92f2ec8ffb..cbdee3c1560 100644
--- a/source/blender/modifiers/intern/MOD_particlesystem.c
+++ b/source/blender/modifiers/intern/MOD_particlesystem.c
@@ -162,7 +162,7 @@ static void deformVerts(
 
 			if (edit_btmesh) {
 				/* In edit mode get directly from the edit mesh. */
-				psmd->mesh_original = BKE_mesh_from_bmesh_nomain(edit_btmesh->bm, &(struct BMeshToMeshParams){0});
+				psmd->mesh_original = BKE_mesh_from_bmesh_for_eval_nomain(edit_btmesh->bm, 0);
 			}
 			else {
 				/* Otherwise get regular mesh. */
diff --git a/source/blender/modifiers/intern/MOD_shrinkwrap.c b/source/blender/modifiers/intern/MOD_shrinkwrap.c
index 196cdb63ba1..7864e888a48 100644
--- a/source/blender/modifiers/intern/MOD_shrinkwrap.c
+++ b/source/blender/modifiers/intern/MOD_shrinkwrap.c
@@ -126,7 +126,7 @@ static void deformVertsEM(
 	Mesh *mesh_src = mesh;
 
 	if (mesh_src == NULL) {
-		mesh_src = BKE_mesh_from_bmesh_nomain(editData->bm, &(struct BMeshToMeshParams){0});
+		mesh_src = BKE_mesh_from_bmesh_for_eval_nomain(editData->bm, 0);
 	}
 
 	BLI_assert(mesh_src->totvert == numVerts);
diff --git a/source/blender/modifiers/intern/MOD_skin.c b/source/blender/modifiers/intern/MOD_skin.c
index 4b8759d2f4d..9e557b456d3 100644
--- a/source/blender/modifiers/intern/MOD_skin.c
+++ b/source/blender/modifiers/intern/MOD_skin.c
@@ -1880,7 +1880,7 @@ static Mesh *base_skin(Mesh *origmesh,
 	if (!bm)
 		return NULL;
 
-	result = BKE_mesh_from_bmesh_nomain(bm, &(struct BMeshToMeshParams){0});
+	result = BKE_mesh_from_bmesh_for_eval_nomain(bm, 0);
 	BM_mesh_free(bm);
 
 	result->runtime.cd_dirty_vert |= CD_MASK_NORMAL;
diff --git a/source/blender/modifiers/intern/MOD_smooth.c b/source/blender/modifiers/intern/MOD_smooth.c
index 916f862b29f..87e40f86b95 100644
--- a/source/blender/modifiers/intern/MOD_smooth.c
+++ b/source/blender/modifiers/intern/MOD_smooth.c
@@ -232,7 +232,7 @@ static void deformVertsEM(
 	Mesh *mesh_src = mesh;
 
 	if (mesh_src == NULL) {
-		mesh_src = BKE_mesh_from_bmesh_nomain(editData->bm, &(struct BMeshToMeshParams){0});
+		mesh_src = BKE_mesh_from_bmesh_for_eval_nomain(editData->bm, 0);
 	}
 
 	BLI_assert(mesh_src->totvert == numVerts);
diff --git a/source/blender/modifiers/intern/MOD_triangulate.c b/source/blender/modifiers/intern/MOD_triangulate.c
index abbd36701e2..6c38d208c02 100644
--- a/source/blender/modifiers/intern/MOD_triangulate.c
+++ b/source/blender/modifiers/intern/MOD_triangulate.c
@@ -53,7 +53,7 @@ static Mesh *triangulate_mesh(Mesh *mesh, const int quad_method, const int ngon_
 
 	BM_mesh_triangulate(bm, quad_method, ngon_method, false, NULL, NULL, NULL);
 
-	result = BKE_mesh_from_bmesh_nomain(bm, &((struct BMeshToMeshParams){0}));
+	result = BKE_mesh_from_bmesh_for_eval_nomain(bm, 0);
 	BM_mesh_free(bm);
 
 	total_edges = result->totedge;
diff --git a/source/blender/modifiers/intern/MOD_util.c b/source/blender/modifiers/intern/MOD_util.c
index 0b6a3bc4b99..d156f119eec 100644
--- a/source/blender/modifiers/intern/MOD_util.c
+++ b/source/blender/modifiers/intern/MOD_util.c
@@ -177,7 +177,7 @@ Mesh *MOD_get_mesh_eval(
 	}
 	else if (ob->type == OB_MESH) {
 		if (em) {
-			mesh = BKE_mesh_from_bmesh_nomain(em->bm, &(struct BMeshToMeshParams){0});
+			mesh = BKE_mesh_from_bmesh_for_eval_nomain(em->bm, 0);
 		}
 		else {
 			/* TODO(sybren): after modifier conversion of DM to Mesh is done, check whether
diff --git a/source/blender/modifiers/intern/MOD_warp.c b/source/blender/modifiers/intern/MOD_warp.c
index b8916344576..0329300630a 100644
--- a/source/blender/modifiers/intern/MOD_warp.c
+++ b/source/blender/modifiers/intern/MOD_warp.c
@@ -332,7 +332,7 @@ static void deformVertsEM(
 	Mesh *mesh_src = mesh;
 
 	if (mesh_src == NULL) {
-		mesh_src = BKE_mesh_from_bmesh_nomain(em->bm, &(struct BMeshToMeshParams){0});
+		mesh_src = BKE_mesh_from_bmesh_for_eval_nomain(em->bm, 0);
 	}
 
 	BLI_assert(mesh_src->totvert == numVerts);
diff --git a/source/blender/modifiers/intern/MOD_wireframe.c b/source/blender/modifiers/intern/MOD_wireframe.c
index 35b16e0944e..15e26fb5c2e 100644
--- a/source/blender/modifiers/intern/MOD_wireframe.c
+++ b/source/blender/modifiers/intern/MOD_wireframe.c
@@ -93,7 +93,7 @@ static Mesh *WireframeModifier_do(WireframeModifierData *wmd, Object *ob, Mesh *
 	       MAX2(ob->totcol - 1, 0),
 	       false);
 
-	result = BKE_mesh_from_bmesh_nomain(bm, &(struct BMeshToMeshParams){0});
+	result = BKE_mesh_from_bmesh_for_eval_nomain(bm, 0);
 	BM_mesh_free(bm);
 
 	result->runtime.cd_dirty_vert |= CD_MASK_NORMAL;