Particle System: ported most DerivedMesh → Mesh

There are a few places where DerivedMesh is still used, most notably
when calling the (not yet ported) cloth simulation. There is also still
the use of Object.derivedDeform and Object.derivedFinal. Those places are
marked with a TODO.

Some functions in the editors module were copied to accept Mesh. Those
already had 'mesh' in the name; the copies are suffixed with '__real_mesh'
for easy renaming later when the DM-based functionality is removed.

1 files changed, 32 insertions, 29 deletions

diff --git a/source/blender/makesrna/intern/rna_particle.c b/source/blender/makesrna/intern/rna_particle.c
index f0d5a7e7c2e..2991d7a4860 100644
--- a/source/blender/makesrna/intern/rna_particle.c
+++ b/source/blender/makesrna/intern/rna_particle.c
@@ -32,6 +32,7 @@
 #include <limits.h>
 
 #include "DNA_material_types.h"
+#include "DNA_mesh_types.h"
 #include "DNA_meshdata_types.h"
 #include "DNA_modifier_types.h"
 #include "DNA_cloth_types.h"
@@ -45,6 +46,8 @@
 #include "RNA_define.h"
 #include "RNA_enum_types.h"
 
+#include "BKE_mesh.h"
+
 #include "BLI_string_utils.h"
 
 #include "BLT_translation.h"
@@ -179,7 +182,7 @@ static void rna_ParticleHairKey_location_object_info(PointerRNA *ptr, ParticleSy
 	for (md = ob->modifiers.first; md; md = md->next) {
 		if (md->type == eModifierType_ParticleSystem) {
 			psmd = (ParticleSystemModifierData *) md;
-			if (psmd && psmd->dm_final && psmd->psys) {
+			if (psmd && psmd->mesh_final && psmd->psys) {
 				psys = psmd->psys;
 				for (i = 0, pa = psys->particles; i < psys->totpart; i++, pa++) {
 					/* hairkeys are stored sequentially in memory, so we can
@@ -206,15 +209,15 @@ static void rna_ParticleHairKey_location_object_get(PointerRNA *ptr, float *valu
 	rna_ParticleHairKey_location_object_info(ptr, &psmd, &pa);
 
 	if (pa) {
-		DerivedMesh *hairdm = (psmd->psys->flag & PSYS_HAIR_DYNAMICS) ? psmd->psys->hair_out_dm : NULL;
+		Mesh *hair_mesh = (psmd->psys->flag & PSYS_HAIR_DYNAMICS) ? psmd->psys->hair_out_mesh : NULL;
 
-		if (hairdm) {
-			MVert *mvert = CDDM_get_vert(hairdm, pa->hair_index + (hkey - pa->hair));
+		if (hair_mesh) {
+			MVert *mvert = &hair_mesh->mvert[pa->hair_index + (hkey - pa->hair)];
 			copy_v3_v3(values, mvert->co);
 		}
 		else {
 			float hairmat[4][4];
-			psys_mat_hair_to_object(ob, psmd->dm_final, psmd->psys->part->from, pa, hairmat);
+			psys_mat_hair_to_object(ob, psmd->mesh_final, psmd->psys->part->from, pa, hairmat);
 			copy_v3_v3(values, hkey->co);
 			mul_m4_v3(hairmat, values);
 		}
@@ -234,17 +237,17 @@ static void rna_ParticleHairKey_location_object_set(PointerRNA *ptr, const float
 	rna_ParticleHairKey_location_object_info(ptr, &psmd, &pa);
 
 	if (pa) {
-		DerivedMesh *hairdm = (psmd->psys->flag & PSYS_HAIR_DYNAMICS) ? psmd->psys->hair_out_dm : NULL;
+		Mesh *hair_mesh = (psmd->psys->flag & PSYS_HAIR_DYNAMICS) ? psmd->psys->hair_out_mesh : NULL;
 
-		if (hairdm) {
-			MVert *mvert = CDDM_get_vert(hairdm, pa->hair_index + (hkey - pa->hair));
+		if (hair_mesh) {
+			MVert *mvert = &hair_mesh->mvert[pa->hair_index + (hkey - pa->hair)];
 			copy_v3_v3(mvert->co, values);
 		}
 		else {
 			float hairmat[4][4];
 			float imat[4][4];
 
-			psys_mat_hair_to_object(ob, psmd->dm_final, psmd->psys->part->from, pa, hairmat);
+			psys_mat_hair_to_object(ob, psmd->mesh_final, psmd->psys->part->from, pa, hairmat);
 			invert_m4_m4(imat, hairmat);
 			copy_v3_v3(hkey->co, values);
 			mul_m4_v3(imat, hkey->co);
@@ -259,15 +262,15 @@ static void rna_ParticleHairKey_co_object(HairKey *hairkey, Object *object, Part
                                              float n_co[3])
 {
 
-	DerivedMesh *hairdm = (modifier->psys->flag & PSYS_HAIR_DYNAMICS) ? modifier->psys->hair_out_dm : NULL;
+	Mesh *hair_mesh = (modifier->psys->flag & PSYS_HAIR_DYNAMICS) ? modifier->psys->hair_out_mesh : NULL;
 	if (particle) {
-		if (hairdm) {
-			MVert *mvert = CDDM_get_vert(hairdm, particle->hair_index + (hairkey - particle->hair));
+		if (hair_mesh) {
+			MVert *mvert = &hair_mesh->mvert[particle->hair_index + (hairkey - particle->hair)];
 			copy_v3_v3(n_co, mvert->co);
 		}
 		else {
 			float hairmat[4][4];
-			psys_mat_hair_to_object(object, modifier->dm_final, modifier->psys->part->from, particle, hairmat);
+			psys_mat_hair_to_object(object, modifier->mesh_final, modifier->psys->part->from, particle, hairmat);
 			copy_v3_v3(n_co, hairkey->co);
 			mul_m4_v3(hairmat, n_co);
 		}
@@ -286,14 +289,14 @@ static void rna_Particle_uv_on_emitter(ParticleData *particle, ReportList *repor
 	int num = particle->num_dmcache;
 	int from = modifier->psys->part->from;
 
-	if (!CustomData_has_layer(&modifier->dm_final->loopData, CD_MLOOPUV)) {
+	if (!CustomData_has_layer(&modifier->mesh_final->ldata, CD_MLOOPUV)) {
 		BKE_report(reports, RPT_ERROR, "Mesh has no UV data");
 		return;
 	}
-	DM_ensure_tessface(modifier->dm_final); /* BMESH - UNTIL MODIFIER IS UPDATED FOR MPoly */
+	BKE_mesh_tessface_ensure(modifier->mesh_final); /* BMESH - UNTIL MODIFIER IS UPDATED FOR MPoly */
 
 	if (num == DMCACHE_NOTFOUND)
-		if (particle->num < modifier->dm_final->getNumTessFaces(modifier->dm_final))
+		if (particle->num < modifier->mesh_final->totface)
 			num = particle->num;
 
 	/* get uvco */
@@ -303,8 +306,8 @@ static void rna_Particle_uv_on_emitter(ParticleData *particle, ReportList *repor
 			MFace *mface;
 			MTFace *mtface;
 
-			mface = modifier->dm_final->getTessFaceData(modifier->dm_final, num, CD_MFACE);
-			mtface = (MTFace *)CustomData_get_layer_n(&modifier->dm_final->faceData, CD_MTFACE, 0);
+			mface = modifier->mesh_final->mface;
+			mtface = modifier->mesh_final->mtface;
 
 			if (mface && mtface) {
 				mtface += num;
@@ -423,9 +426,9 @@ static int rna_ParticleSystem_tessfaceidx_on_emitter(ParticleSystem *particlesys
 	int totvert;
 	int num = -1;
 
-	DM_ensure_tessface(modifier->dm_final); /* BMESH - UNTIL MODIFIER IS UPDATED FOR MPoly */
-	totface = modifier->dm_final->getNumTessFaces(modifier->dm_final);
-	totvert = modifier->dm_final->getNumVerts(modifier->dm_final);
+	BKE_mesh_tessface_ensure(modifier->mesh_final); /* BMESH - UNTIL MODIFIER IS UPDATED FOR MPoly */
+	totface = modifier->mesh_final->totface;
+	totvert = modifier->mesh_final->totvert;
 
 	/* 1. check that everything is ok & updated */
 	if (!particlesystem || !totface) {
@@ -455,7 +458,7 @@ static int rna_ParticleSystem_tessfaceidx_on_emitter(ParticleSystem *particlesys
 		}
 		else if (part->from == PART_FROM_VERT) {
 			if (num != DMCACHE_NOTFOUND && num < totvert) {
-				MFace *mface = modifier->dm_final->getTessFaceDataArray(modifier->dm_final, CD_MFACE);
+				MFace *mface = modifier->mesh_final->mface;
 
 				*r_fuv = &particle->fuv;
 
@@ -497,7 +500,7 @@ static int rna_ParticleSystem_tessfaceidx_on_emitter(ParticleSystem *particlesys
 			}
 			else if (part->from == PART_FROM_VERT) {
 				if (num != DMCACHE_NOTFOUND && num < totvert) {
-					MFace *mface = modifier->dm_final->getTessFaceDataArray(modifier->dm_final, CD_MFACE);
+					MFace *mface = modifier->mesh_final->mface;
 
 					*r_fuv = &parent->fuv;
 
@@ -521,7 +524,7 @@ static void rna_ParticleSystem_uv_on_emitter(ParticleSystem *particlesystem, Rep
                                              ParticleSystemModifierData *modifier, ParticleData *particle,
                                              int particle_no, int uv_no, float r_uv[2])
 {
-	if (!CustomData_has_layer(&modifier->dm_final->loopData, CD_MLOOPUV)) {
+	if (!CustomData_has_layer(&modifier->mesh_final->ldata, CD_MLOOPUV)) {
 		BKE_report(reports, RPT_ERROR, "Mesh has no UV data");
 		zero_v2(r_uv);
 		return;
@@ -538,8 +541,8 @@ static void rna_ParticleSystem_uv_on_emitter(ParticleSystem *particlesystem, Rep
 			zero_v2(r_uv);
 		}
 		else {
-			MFace *mface = modifier->dm_final->getTessFaceData(modifier->dm_final, num, CD_MFACE);
-			MTFace *mtface = (MTFace *)CustomData_get_layer_n(&modifier->dm_final->faceData, CD_MTFACE, uv_no);
+			MFace *mface = &modifier->mesh_final->mface[num];
+			MTFace *mtface = (MTFace *)CustomData_get_layer_n(&modifier->mesh_final->fdata, CD_MTFACE, uv_no);
 
 			psys_interpolate_uvs(&mtface[num], mface->v4, *fuv, r_uv);
 		}
@@ -550,7 +553,7 @@ static void rna_ParticleSystem_mcol_on_emitter(ParticleSystem *particlesystem, R
                                                ParticleSystemModifierData *modifier, ParticleData *particle,
                                                int particle_no, int vcol_no, float r_mcol[3])
 {
-	if (!CustomData_has_layer(&modifier->dm_final->loopData, CD_MLOOPCOL)) {
+	if (!CustomData_has_layer(&modifier->mesh_final->ldata, CD_MLOOPCOL)) {
 		BKE_report(reports, RPT_ERROR, "Mesh has no VCol data");
 		zero_v3(r_mcol);
 		return;
@@ -567,8 +570,8 @@ static void rna_ParticleSystem_mcol_on_emitter(ParticleSystem *particlesystem, R
 			zero_v3(r_mcol);
 		}
 		else {
-			MFace *mface = modifier->dm_final->getTessFaceData(modifier->dm_final, num, CD_MFACE);
-			MCol *mc = (MCol *)CustomData_get_layer_n(&modifier->dm_final->faceData, CD_MCOL, vcol_no);
+			MFace *mface = &modifier->mesh_final->mface[num];
+			MCol *mc = (MCol *)CustomData_get_layer_n(&modifier->mesh_final->fdata, CD_MCOL, vcol_no);
 			MCol mcol;
 
 			psys_interpolate_mcol(&mc[num * 4], mface->v4, *fuv, &mcol);