Modifiers: ported curve_calc_modifiers_post() internals from DerivedMesh → Mesh

The function still returns a DerivedMesh, but internally it uses Mesh
now.

3 files changed, 65 insertions, 35 deletions

diff --git a/source/blender/blenkernel/BKE_mesh.h b/source/blender/blenkernel/BKE_mesh.h
index bdeb3313918..c2aab862c1b 100644
--- a/source/blender/blenkernel/BKE_mesh.h
+++ b/source/blender/blenkernel/BKE_mesh.h
@@ -209,6 +209,7 @@ void BKE_mesh_apply_vert_coords(struct Mesh *mesh, float (*vertCoords)[3]);
 
 /* *** mesh_evaluate.c *** */
 
+void BKE_mesh_calc_normals_mapping_simple(struct Mesh *me);
 void BKE_mesh_calc_normals_mapping(
         struct MVert *mverts, int numVerts,
         const struct MLoop *mloop, const struct MPoly *mpolys, int numLoops, int numPolys, float (*r_polyNors)[3],
diff --git a/source/blender/blenkernel/intern/displist.c b/source/blender/blenkernel/intern/displist.c
index fa996b8f73e..547235239ec 100644
--- a/source/blender/blenkernel/intern/displist.c
+++ b/source/blender/blenkernel/intern/displist.c
@@ -37,6 +37,7 @@
 #include "MEM_guardedalloc.h"
 
 #include "DNA_curve_types.h"
+#include "DNA_mesh_types.h"
 #include "DNA_scene_types.h"
 #include "DNA_object_types.h"
 #include "DNA_vfont_types.h"
@@ -51,8 +52,10 @@
 #include "BKE_displist.h"
 #include "BKE_cdderivedmesh.h"
 #include "BKE_object.h"
+#include "BKE_library.h"
 #include "BKE_mball.h"
 #include "BKE_mball_tessellate.h"
+#include "BKE_mesh.h"
 #include "BKE_curve.h"
 #include "BKE_key.h"
 #include "BKE_anim.h"
@@ -925,7 +928,7 @@ static void curve_calc_modifiers_post(
 	Curve *cu = ob->data;
 	int required_mode = 0, totvert = 0;
 	const bool editmode = (!for_render && (cu->editnurb || cu->editfont));
-	DerivedMesh *dm = NULL, *ndm;
+	Mesh *modified = NULL, *mesh_applied;
 	float (*vertCos)[3] = NULL;
 	int useCache = !for_render;
 	ModifierApplyFlag app_flag = 0;
@@ -963,23 +966,21 @@ static void curve_calc_modifiers_post(
 			continue;
 
 		if (mti->type == eModifierTypeType_OnlyDeform ||
-		    (mti->type == eModifierTypeType_DeformOrConstruct && !dm))
+		    (mti->type == eModifierTypeType_DeformOrConstruct && !modified))
 		{
-			if (dm) {
+			if (modified) {
 				if (!vertCos) {
-					totvert = dm->getNumVerts(dm);
-					vertCos = MEM_mallocN(sizeof(*vertCos) * totvert, "dfmv");
-					dm->getVertCos(dm, vertCos);
+					vertCos = BKE_mesh_vertexCos_get(modified, &totvert);
 				}
 
-				modifier_deformVerts_DM_deprecated(md, &mectx_deform, dm, vertCos, totvert);
+				modifier_deformVerts(md, &mectx_deform, modified, vertCos, totvert);
 			}
 			else {
 				if (!vertCos) {
 					vertCos = displist_get_allverts(dispbase, &totvert);
 				}
 
-				modifier_deformVerts_DM_deprecated(md, &mectx_deform, NULL, vertCos, totvert);
+				modifier_deformVerts(md, &mectx_deform, NULL, vertCos, totvert);
 			}
 		}
 		else {
@@ -991,13 +992,17 @@ static void curve_calc_modifiers_post(
 				break;
 			}
 
-			if (dm) {
+			if (modified) {
 				if (vertCos) {
-					DerivedMesh *tdm = CDDM_copy(dm);
-					dm->release(dm);
-					dm = tdm;
-
-					CDDM_apply_vert_coords(dm, vertCos);
+					Mesh *temp_mesh;
+					BKE_id_copy_ex(NULL, &modified->id, (ID **)&temp_mesh,
+					               LIB_ID_CREATE_NO_MAIN | LIB_ID_CREATE_NO_USER_REFCOUNT |
+					               LIB_ID_CREATE_NO_DEG_TAG | LIB_ID_COPY_NO_PREVIEW,
+					               false);
+					BKE_id_free(NULL, modified);
+					modified = temp_mesh;
+
+					BKE_mesh_apply_vert_coords(modified, vertCos);
 				}
 			}
 			else {
@@ -1009,7 +1014,7 @@ static void curve_calc_modifiers_post(
 					curve_to_filledpoly(cu, nurb, dispbase);
 				}
 
-				dm = CDDM_from_curve_displist(ob, dispbase);
+				modified = BKE_mesh_new_nomain_from_curve_displist(ob, dispbase);
 			}
 
 			if (vertCos) {
@@ -1018,26 +1023,31 @@ static void curve_calc_modifiers_post(
 				vertCos = NULL;
 			}
 
-			ndm = modwrap_applyModifier(md, &mectx_apply, dm);
+			mesh_applied = modifier_applyModifier(md, &mectx_apply, modified);
 
-			if (ndm) {
+			if (mesh_applied) {
 				/* Modifier returned a new derived mesh */
 
-				if (dm && dm != ndm) /* Modifier  */
-					dm->release(dm);
-				dm = ndm;
+				if (modified && modified != mesh_applied) /* Modifier  */
+					BKE_id_free(NULL, modified);
+				modified = mesh_applied;
 			}
 		}
 	}
 
 	if (vertCos) {
-		if (dm) {
-			DerivedMesh *tdm = CDDM_copy(dm);
-			dm->release(dm);
-			dm = tdm;
+		if (modified) {
+			Mesh *temp_mesh;
+			BKE_id_copy_ex(NULL, &modified->id, (ID **)&temp_mesh,
+			               LIB_ID_CREATE_NO_MAIN | LIB_ID_CREATE_NO_USER_REFCOUNT |
+			               LIB_ID_CREATE_NO_DEG_TAG | LIB_ID_COPY_NO_PREVIEW,
+			               false);
+			BKE_id_free(NULL, modified);
+			modified = temp_mesh;
+
+			BKE_mesh_apply_vert_coords(modified, vertCos);
+			BKE_mesh_calc_normals_mapping_simple(modified);
 
-			CDDM_apply_vert_coords(dm, vertCos);
-			CDDM_calc_normals_mapping(dm);
 			MEM_freeN(vertCos);
 		}
 		else {
@@ -1048,22 +1058,27 @@ static void curve_calc_modifiers_post(
 	}
 
 	if (r_dm_final) {
-		if (dm) {
+		if (modified) {
 			/* see: mesh_calc_modifiers */
-			if (dm->getNumTessFaces(dm) == 0) {
-				dm->recalcTessellation(dm);
+			if (modified->totface == 0) {
+				BKE_mesh_tessface_calc(modified);
 			}
 			/* Even if tessellation is not needed, some modifiers might have modified CD layers
 			 * (like mloopcol or mloopuv), hence we have to update those. */
-			else if (dm->dirty & DM_DIRTY_TESS_CDLAYERS) {
-				DM_update_tessface_data(dm);
+			else if (modified->runtime.cd_dirty_vert & CD_MASK_TESSLOOPNORMAL) {
+				BKE_mesh_tessface_calc(modified);
 			}
 
-			if (dm->type == DM_TYPE_CDDM) {
-				CDDM_calc_normals_mapping_ex(dm, (dm->dirty & DM_DIRTY_NORMALS) ? false : true);
-			}
+			/* XXX2.8(Sybren): make sure the face normals are recalculated as well */
+			BKE_mesh_ensure_normals(modified);
+
+			(*r_dm_final) = CDDM_from_mesh(modified);
+			BKE_id_free(NULL, modified);
 		}
-		(*r_dm_final) = dm;
+		else {
+			(*r_dm_final) = NULL;
+		}
+
 	}
 }
 
diff --git a/source/blender/blenkernel/intern/mesh_evaluate.c b/source/blender/blenkernel/intern/mesh_evaluate.c
index 068be0ef304..2d8476d6f02 100644
--- a/source/blender/blenkernel/intern/mesh_evaluate.c
+++ b/source/blender/blenkernel/intern/mesh_evaluate.c
@@ -88,6 +88,20 @@ static void mesh_calc_normals_vert_fallback(MVert *mverts, int numVerts)
 	}
 }
 
+/* TODO(Sybren): we can probably rename this to BKE_mesh_calc_normals_mapping(),
+ * and remove the function of the same name below, as that one doesn't seem to be
+ * called anywhere. */
+void BKE_mesh_calc_normals_mapping_simple(struct Mesh *mesh)
+{
+	const bool only_face_normals = CustomData_is_referenced_layer(&mesh->vdata, CD_MVERT);
+
+	BKE_mesh_calc_normals_mapping_ex(
+	            mesh->mvert, mesh->totvert,
+	            mesh->mloop, mesh->mpoly, mesh->totloop, mesh->totpoly, NULL,
+	            mesh->mface, mesh->totface, NULL, NULL,
+	            only_face_normals);
+}
+
 /* Calculate vertex and face normals, face normals are returned in *r_faceNors if non-NULL
  * and vertex normals are stored in actual mverts.
  */