Modifiers: Armature DerivedMesh → Mesh

The mesh parameter of armature_deform_verts() is now const, to indicate
that it's safe to pass ob->data to it directly.

3 files changed, 55 insertions, 28 deletions

diff --git a/source/blender/blenkernel/BKE_lattice.h b/source/blender/blenkernel/BKE_lattice.h
index 1e3921747a5..37f838a543c 100644
--- a/source/blender/blenkernel/BKE_lattice.h
+++ b/source/blender/blenkernel/BKE_lattice.h
@@ -38,6 +38,7 @@
 
 struct Lattice;
 struct Main;
+struct Mesh;
 struct Object;
 struct Scene;
 struct DerivedMesh;
@@ -73,7 +74,7 @@ void lattice_deform_verts(struct Object *laOb, struct Object *target,
                           struct DerivedMesh *dm, float (*vertexCos)[3],
                           int numVerts, const char *vgroup, float influence);
 void armature_deform_verts(struct Object *armOb, struct Object *target,
-                           struct DerivedMesh *dm, float (*vertexCos)[3],
+                           const struct Mesh *mesh, float (*vertexCos)[3],
                            float (*defMats)[3][3], int numVerts, int deformflag,
                            float (*prevCos)[3], const char *defgrp_name);
 
diff --git a/source/blender/blenkernel/intern/armature.c b/source/blender/blenkernel/intern/armature.c
index d1b02695c35..2ded32b3ec9 100644
--- a/source/blender/blenkernel/intern/armature.c
+++ b/source/blender/blenkernel/intern/armature.c
@@ -963,7 +963,7 @@ static void armature_bbone_defmats_cb(void *userdata, Link *iter, int index)
 	}
 }
 
-void armature_deform_verts(Object *armOb, Object *target, DerivedMesh *dm, float (*vertexCos)[3],
+void armature_deform_verts(Object *armOb, Object *target, const Mesh * mesh, float (*vertexCos)[3],
                            float (*defMats)[3][3], int numVerts, int deformflag,
                            float (*prevCos)[3], const char *defgrp_name)
 {
@@ -1039,9 +1039,9 @@ void armature_deform_verts(Object *armOb, Object *target, DerivedMesh *dm, float
 	/* get a vertex-deform-index to posechannel array */
 	if (deformflag & ARM_DEF_VGROUP) {
 		if (ELEM(target->type, OB_MESH, OB_LATTICE)) {
-			/* if we have a DerivedMesh, only use dverts if it has them */
-			if (dm) {
-				use_dverts = (dm->getVertDataArray(dm, CD_MDEFORMVERT) != NULL);
+			/* if we have a Mesh, only use dverts if it has them */
+			if (mesh) {
+				use_dverts = (mesh->dvert != NULL);
 			}
 			else if (dverts) {
 				use_dverts = true;
@@ -1103,8 +1103,10 @@ void armature_deform_verts(Object *armOb, Object *target, DerivedMesh *dm, float
 		}
 
 		if (use_dverts || armature_def_nr != -1) {
-			if (dm)
-				dvert = dm->getVertData(dm, i, CD_MDEFORMVERT);
+			if (mesh) {
+				BLI_assert(i < mesh->totvert);
+				dvert = mesh->dvert + i;
+			}
 			else if (dverts && i < target_totvert)
 				dvert = dverts + i;
 			else
diff --git a/source/blender/blenkernel/intern/modifier.c b/source/blender/blenkernel/intern/modifier.c
index f7892e2f08b..3caa3a032ff 100644
--- a/source/blender/blenkernel/intern/modifier.c
+++ b/source/blender/blenkernel/intern/modifier.c
@@ -1033,14 +1033,20 @@ void modifier_deformMatrices_DM_deprecated(struct ModifierData *md, struct Depsg
 		mti->deformMatrices_DM(md, depsgraph, ob, dm, vertexCos, defMats, numVerts);
 	}
 	else {
-		struct Mesh mesh;
-		BKE_mesh_init(&mesh);
-
-		DM_to_mesh(dm, &mesh, ob, CD_MASK_EVERYTHING, false);
+		/* TODO(sybren): deduplicate all the copies of this code in this file. */
+		Mesh *mesh = NULL;
+		if (dm != NULL) {
+			mesh = BKE_libblock_alloc_notest(ID_ME);
+			BKE_mesh_init(mesh);
+			DM_to_mesh(dm, mesh, ob, CD_MASK_EVERYTHING, false);
+		}
 
-		mti->deformMatrices(md, depsgraph, ob, &mesh, vertexCos, defMats, numVerts);
+		mti->deformMatrices(md, depsgraph, ob, mesh, vertexCos, defMats, numVerts);
 
-		BKE_mesh_free(&mesh);
+		if (mesh != NULL) {
+			BKE_mesh_free(mesh);
+			MEM_freeN(mesh);
+		}
 	}
 }
 
@@ -1054,6 +1060,7 @@ void modifier_deformVertsEM_DM_deprecated(struct ModifierData *md, struct Depsgr
 		mti->deformVertsEM_DM(md, depsgraph, ob, editData, dm, vertexCos, numVerts);
 	}
 	else {
+		/* TODO(sybren): deduplicate all the copies of this code in this file. */
 		Mesh *mesh = NULL;
 		if (dm != NULL) {
 			mesh = BKE_libblock_alloc_notest(ID_ME);
@@ -1080,14 +1087,20 @@ void modifier_deformMatricesEM_DM_deprecated(struct ModifierData *md, struct Dep
 		mti->deformMatricesEM_DM(md, depsgraph, ob, editData, dm, vertexCos, defMats, numVerts);
 	}
 	else {
-		struct Mesh mesh;
-		BKE_mesh_init(&mesh);
-
-		DM_to_mesh(dm, &mesh, ob, CD_MASK_EVERYTHING, false);
+		/* TODO(sybren): deduplicate all the copies of this code in this file. */
+		Mesh *mesh = NULL;
+		if (dm != NULL) {
+			mesh = BKE_libblock_alloc_notest(ID_ME);
+			BKE_mesh_init(mesh);
+			DM_to_mesh(dm, mesh, ob, CD_MASK_EVERYTHING, false);
+		}
 
-		mti->deformMatricesEM(md, depsgraph, ob, editData, &mesh, vertexCos, defMats, numVerts);
+		mti->deformMatricesEM(md, depsgraph, ob, editData, mesh, vertexCos, defMats, numVerts);
 
-		BKE_mesh_free(&mesh);
+		if (mesh != NULL) {
+			BKE_mesh_free(mesh);
+			MEM_freeN(mesh);
+		}
 	}
 }
 
@@ -1140,19 +1153,30 @@ struct DerivedMesh *modifier_applyModifierEM_DM_deprecated(struct ModifierData *
 		return mti->applyModifierEM_DM(md, depsgraph, ob, editData, dm, flag);
 	}
 	else {
-		struct Mesh mesh;
-		BKE_mesh_init(&mesh);
-
-		DM_to_mesh(dm, &mesh, ob, CD_MASK_EVERYTHING, false);
+		/* TODO(sybren): deduplicate all the copies of this code in this file. */
+		Mesh *mesh = NULL;
+		if (dm != NULL) {
+			mesh = BKE_libblock_alloc_notest(ID_ME);
+			BKE_mesh_init(mesh);
+			DM_to_mesh(dm, mesh, ob, CD_MASK_EVERYTHING, false);
+		}
 
-		struct Mesh *new_mesh = mti->applyModifierEM(md, depsgraph, ob, editData, &mesh, flag);
+		struct Mesh *new_mesh = mti->applyModifierEM(md, depsgraph, ob, editData, mesh, flag);
 
 		DerivedMesh *ndm = CDDM_from_mesh(new_mesh);
+		if(new_mesh != mesh) {
+			/* Make a DM that doesn't reference new_mesh so we can free the latter. */
+			/* TODO(sybren): create CDDM_from_mesh_ex() that creates a copy directly. */
+			DerivedMesh *nonref_dm = CDDM_copy(ndm);
+			ndm->release(ndm);
+			ndm = nonref_dm;
 
-		if(new_mesh != &mesh) {
-			BKE_mesh_free(&mesh);
-
-			/* XXX free new_mesh? */
+			BKE_mesh_free(new_mesh);
+			MEM_freeN(new_mesh);
+		}
+		if (mesh != NULL) {
+			BKE_mesh_free(mesh);
+			MEM_freeN(mesh);
 		}
 
 		return ndm;