[Bf-blender-cvs] [5a6af777a87] temp-modifier-rm-cddm: Precious attempt at being ok

[Sybren A. Stüvel]

Commit: 5a6af777a8737b5e4cf7f4def65767a99bb20ffe
Author: Sybren A. Stüvel
Date:   Fri Apr 20 16:50:21 2018 +0200
Branches: temp-modifier-rm-cddm
https://developer.blender.org/rB5a6af777a8737b5e4cf7f4def65767a99bb20ffe

Precious attempt at being ok

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

M	source/blender/blenkernel/intern/mesh.c
M	source/blender/blenkernel/intern/modifier.c

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

diff --git a/source/blender/blenkernel/intern/mesh.c b/source/blender/blenkernel/intern/mesh.c
index b204d26ddb7..8efb2708aa6 100644
--- a/source/blender/blenkernel/intern/mesh.c
+++ b/source/blender/blenkernel/intern/mesh.c
@@ -607,7 +607,7 @@ void BKE_mesh_copy_data(Main *bmain, Mesh *me_dst, const Mesh *me_src, const int
 	}
 }
 
-Mesh *BKE_mesh_from_template_ex(
+static Mesh *mesh_from_template_ex(
         Mesh *me_src,
         int numVerts, int numEdges, int numTessFaces,
         int numLoops, int numPolys,
@@ -648,10 +648,11 @@ Mesh * BKE_mesh_from_template(Mesh *me_src,
                               int numLoops, int numPolys)
 {
 	printf("BKE_mesh_from_template(%p, %d, %d, %d, %d, %d)\n", me_src, numVerts, numEdges, numTessFaces, numLoops, numPolys);
-	return BKE_mesh_from_template_ex(me_src,
-	                                 numVerts, numEdges, numTessFaces,
-	                                 numLoops, numPolys,
-	                                 CD_MASK_EVERYTHING);
+	return mesh_from_template_ex(
+	            me_src,
+	            numVerts, numEdges, numTessFaces,
+	            numLoops, numPolys,
+	            CD_MASK_EVERYTHING);
 }
 
 Mesh *BKE_mesh_copy(Main *bmain, const Mesh *me)
diff --git a/source/blender/blenkernel/intern/modifier.c b/source/blender/blenkernel/intern/modifier.c
index 1744c3f2990..f610ac70c65 100644
--- a/source/blender/blenkernel/intern/modifier.c
+++ b/source/blender/blenkernel/intern/modifier.c
@@ -1102,21 +1102,24 @@ struct DerivedMesh *modifier_applyModifier_DM_deprecated(struct ModifierData *md
 		struct Mesh *mesh = ob->data;
 		BLI_assert(DEG_depsgraph_use_copy_on_write());
 		BLI_assert(mesh->id.tag & LIB_TAG_COPY_ON_WRITE); /* This should be a CoW mesh */
-//		if (dm != NULL) {
-////			BKE_mesh_free(mesh);
-//			printf("Converting DM_to_mesh(dm=%p, mesh=%s=%p)\n", dm, mesh->id.name, mesh);
-//			DM_to_mesh(dm, mesh, ob, CD_MASK_EVERYTHING, false);
-//		}
+		if (dm != NULL) {
+//			BKE_mesh_free(mesh);
+			mesh = MEM_callocN(sizeof(struct Mesh), "Mesh");
+//			MEMSET_STRUCT_OFS(mesh, 0, id);
+			BKE_mesh_init(mesh);
+			printf("Converting DM_to_mesh(dm=%p, mesh=%s=%p)\n", dm, mesh->id.name, mesh);
+			DM_to_mesh(dm, mesh, ob, CD_MASK_EVERYTHING, false);
+		}
 
 		struct Mesh *new_mesh = mti->applyModifier(md, depsgraph, ob, mesh, flag);
 		printf("    created new mesh %s=%p\n", new_mesh->id.name, new_mesh);
 
 		DerivedMesh *ndm = CDDM_from_mesh(new_mesh);
 
-//		if(new_mesh != mesh) {
+		if(new_mesh != mesh) {
 //			BKE_mesh_free(new_mesh);
 //			MEM_freeN(new_mesh);
-//		}
+		}
 
 		return ndm;
 	}