[Bf-blender-cvs] [ecbe08f036e] temp-modifier-rm-cddm: remove debug prints and stuff
Sybren A. Stüvel
noreply at git.blender.org
Fri Apr 20 10:23:30 CEST 2018
Commit: ecbe08f036e01c51d97a335364310118d2b8129f
Author: Sybren A. Stüvel
Date: Fri Apr 20 10:09:57 2018 +0200
Branches: temp-modifier-rm-cddm
https://developer.blender.org/rBecbe08f036e01c51d97a335364310118d2b8129f
remove debug prints and stuff
===================================================================
M source/blender/blenkernel/intern/DerivedMesh.c
M source/blender/blenkernel/intern/modifier.c
===================================================================
diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c
index c86950d82cb..4dfb0c71583 100644
--- a/source/blender/blenkernel/intern/DerivedMesh.c
+++ b/source/blender/blenkernel/intern/DerivedMesh.c
@@ -2473,7 +2473,6 @@ static void editbmesh_calc_modifiers(
struct Mesh *mesh = ob->data;
if (mesh->id.tag & LIB_TAG_COPY_ON_WRITE) {
BKE_mesh_ensure_edit_data(mesh);
- printf("Saving cage deformed verts in CoW mesh %p\n", mesh);
mesh->emd->vertexCos = MEM_dupallocN(deformedVerts);
}
*r_cage = getEditDerivedBMesh(
@@ -2517,7 +2516,6 @@ static void editbmesh_calc_modifiers(
if (mesh->id.tag & LIB_TAG_COPY_ON_WRITE) {
BKE_mesh_ensure_edit_data(mesh);
mesh->emd->vertexCos = MEM_dupallocN(deformedVerts);
- printf("Saving final deformed verts in CoW mesh %p\n", mesh);
}
*r_final = getEditDerivedBMesh(em, ob, dataMask, deformedVerts);
diff --git a/source/blender/blenkernel/intern/modifier.c b/source/blender/blenkernel/intern/modifier.c
index bab9a6d5e70..ba1bc9433d2 100644
--- a/source/blender/blenkernel/intern/modifier.c
+++ b/source/blender/blenkernel/intern/modifier.c
@@ -987,11 +987,7 @@ void modifier_deformVerts_DM_deprecated(struct ModifierData *md, struct Depsgrap
else {
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 */
- printf("modifier_deformVerts_DM_deprecated(%s)\n", md->name);
- if ((mesh->id.tag & LIB_TAG_COPY_ON_WRITE) == 0) {
- printf(" WARNING, operating on real Mesh %s = %p\n", mesh->id.name, mesh);
- }
+ BLI_assert(mesh->id.tag & LIB_TAG_COPY_ON_WRITE); /* This should be a CoW mesh */
if (dm != NULL) {
BKE_mesh_free(mesh);
DM_to_mesh(dm, mesh, ob, CD_MASK_EVERYTHING, false);
@@ -1034,9 +1030,10 @@ void modifier_deformVertsEM_DM_deprecated(struct ModifierData *md, struct Depsgr
}
else {
struct Mesh *mesh = ob->data;
- printf("modifier_deformVertsEM_DM_deprecated(%s)\n", md->name);
BLI_assert(DEG_depsgraph_use_copy_on_write());
-// BLI_assert(mesh->id.tag & LIB_TAG_COPY_ON_WRITE); /* This should be a CoW mesh */
+ /* TODO(sybren): the first vertex select in edit mode will result in this function being called
+ * 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);
}
More information about the Bf-blender-cvs
mailing list