[Bf-blender-cvs] [53d4f5c758f] temp-modifier-rm-cddm: Remove debug stuff

[Sybren A. Stüvel]

Commit: 53d4f5c758f9637743ed6495672940fbc5b0b2af
Author: Sybren A. Stüvel
Date:   Tue Apr 24 11:46:55 2018 +0200
Branches: temp-modifier-rm-cddm
https://developer.blender.org/rB53d4f5c758f9637743ed6495672940fbc5b0b2af

Remove debug stuff

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

M	source/blender/blenkernel/intern/cdderivedmesh.c
M	source/blender/blenkernel/intern/mesh.c
M	source/blender/blenkernel/intern/modifier.c
M	source/blender/modifiers/intern/MOD_build.c
M	source/blender/modifiers/intern/MOD_simpledeform.c

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

diff --git a/source/blender/blenkernel/intern/cdderivedmesh.c b/source/blender/blenkernel/intern/cdderivedmesh.c
index fd323fe02de..33540c8746b 100644
--- a/source/blender/blenkernel/intern/cdderivedmesh.c
+++ b/source/blender/blenkernel/intern/cdderivedmesh.c
@@ -1070,9 +1070,6 @@ void CDDM_apply_vert_coords(DerivedMesh *dm, float (*vertCoords)[3])
 	MVert *vert;
 	int i;
 
-	printf("CDDM_apply_vert_coords(cddm=%p, cddm.mvert=%p, vertcoords=%p, coord[0]=(%.3f, %.3f))\n",
-	       cddm, cddm->mvert, vertCoords, vertCoords[0][0], vertCoords[0][1]);
-
 	/* this will just return the pointer if it wasn't a referenced layer */
 	vert = CustomData_duplicate_referenced_layer(&dm->vertData, CD_MVERT, dm->numVertData);
 	cddm->mvert = vert;
diff --git a/source/blender/blenkernel/intern/mesh.c b/source/blender/blenkernel/intern/mesh.c
index 8efb2708aa6..02b49ee6c9c 100644
--- a/source/blender/blenkernel/intern/mesh.c
+++ b/source/blender/blenkernel/intern/mesh.c
@@ -647,7 +647,6 @@ Mesh * BKE_mesh_from_template(Mesh *me_src,
                               int numVerts, int numEdges, int numTessFaces,
                               int numLoops, int numPolys)
 {
-	printf("BKE_mesh_from_template(%p, %d, %d, %d, %d, %d)\n", me_src, numVerts, numEdges, numTessFaces, numLoops, numPolys);
 	return mesh_from_template_ex(
 	            me_src,
 	            numVerts, numEdges, numTessFaces,
diff --git a/source/blender/blenkernel/intern/modifier.c b/source/blender/blenkernel/intern/modifier.c
index d467db49c9a..3d494d819b9 100644
--- a/source/blender/blenkernel/intern/modifier.c
+++ b/source/blender/blenkernel/intern/modifier.c
@@ -1056,7 +1056,7 @@ void modifier_deformVertsEM_DM_deprecated(struct ModifierData *md, struct Depsgr
 		 * with a non-CoW mesh. */
 		/* BLI_assert(mesh->id.tag & LIB_TAG_COPY_ON_WRITE); */ /* This should be a CoW mesh */
 		if ((mesh->id.tag & LIB_TAG_COPY_ON_WRITE) == 0) {
-			printf("   WARNING, operating on real Mesh %s = %p\n", mesh->id.name, mesh);
+			printf("   \033[31mWARNING, operating on real Mesh %s = %p\033[30m\n", mesh->id.name, mesh);
 		}
 
 		if (dm != NULL) {
@@ -1105,25 +1105,10 @@ struct DerivedMesh *modifier_applyModifier_DM_deprecated(struct ModifierData *md
 		BLI_assert(BLI_findindex(&G.main->mesh, mesh) == -1); /* This should be a CoW mesh */
 
 		if (dm != NULL) {
-//			Mesh mesh_l = {0};
-//			BKE_mesh_init(&mesh_l);
-//			DM_to_mesh(dm, &mesh_l, ob, CD_MASK_EVERYTHING, false);
-//			BKE_mesh_free(mesh);
-//			*mesh = mesh_l;
-
-			//			BKE_mesh_free(mesh);
-//			MEMSET_STRUCT_OFS(mesh, 0, id);
-//			mesh = MEM_callocN(sizeof(struct Mesh), "temp mesh");
-//			BKE_mesh_init(mesh);
-			Mesh *orig = (Mesh *)mesh->id.orig_id;
-			printf("Converting DM_to_mesh(dm=%p, mesh=%s=%p  orig=%p   vptr=%p orig=%p)\n",
-			       dm, mesh->id.name, mesh,
-			       orig, mesh->mvert, orig->mvert);
 			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);
 
diff --git a/source/blender/modifiers/intern/MOD_build.c b/source/blender/modifiers/intern/MOD_build.c
index 42e65f01363..b0f54b1baa5 100644
--- a/source/blender/modifiers/intern/MOD_build.c
+++ b/source/blender/modifiers/intern/MOD_build.c
@@ -227,13 +227,9 @@ static Mesh *applyModifier(ModifierData *md, struct Depsgraph *depsgraph,
 		}
 	}
 
-	/* now we know the number of verts, edges and faces, we can create
-	 * the mesh
-	 */
-	printf("Creating new mesh from %s=%p\n", mesh->id.name, mesh);
+	/* now we know the number of verts, edges and faces, we can create the mesh. */
 	result = BKE_mesh_from_template(mesh, BLI_ghash_len(vertHash), BLI_ghash_len(edgeHash),
 	                                0, numLoops_dst, numFaces_dst);
-	printf("    : %s=%p\n", result->id.name, result);
 
 	/* copy the vertices across */
 	GHASH_ITER (gh_iter, vertHash) {
diff --git a/source/blender/modifiers/intern/MOD_simpledeform.c b/source/blender/modifiers/intern/MOD_simpledeform.c
index f59bb9f0744..2e7a3cb7f74 100644
--- a/source/blender/modifiers/intern/MOD_simpledeform.c
+++ b/source/blender/modifiers/intern/MOD_simpledeform.c
@@ -186,8 +186,6 @@ static void SimpleDeformModifier_do(SimpleDeformModifierData *smd, struct Object
                                     float (*vertexCos)[3], int numVerts)
 {
 	const float base_limit[2] = {0.0f, 0.0f};
-	printf("SimpleDeformModifier_do(ob=%p, me=%p, me.mverts=%p, vcos=%p\n", ob, mesh, mesh->mvert, vertexCos);
-
 	int i;
 	float smd_limit[2], smd_factor;
 	SpaceTransform *transf = NULL, tmp_transf;
@@ -396,7 +394,7 @@ static void deformVerts(ModifierData *md, struct Depsgraph *UNUSED(depsgraph),
 }
 
 static void deformVertsEM(ModifierData *md, struct Depsgraph *UNUSED(depsgraph),
-                          Object *ob, struct BMEditMesh *editData,
+                          Object *ob, struct BMEditMesh *UNUSED(editData),
                           struct Mesh *mesh,
                           float (*vertexCos)[3],
                           int numVerts)