[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45574] trunk/blender/source/blender/ blenkernel/intern: improve mesh error prints and quiet a print in mesh_ensure_tessellation_customdata () which happened too often.
Campbell Barton
ideasman42 at gmail.com
Thu Apr 12 16:36:57 CEST 2012
Revision: 45574
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45574
Author: campbellbarton
Date: 2012-04-12 14:36:57 +0000 (Thu, 12 Apr 2012)
Log Message:
-----------
improve mesh error prints and quiet a print in mesh_ensure_tessellation_customdata() which happened too often.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
trunk/blender/source/blender/blenkernel/intern/mesh.c
Modified: trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c 2012-04-12 13:58:16 UTC (rev 45573)
+++ trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c 2012-04-12 14:36:57 UTC (rev 45574)
@@ -453,7 +453,7 @@
}
if (G.debug & G_DEBUG)
- printf("Updated tessellated customdata of dm %p\n", dm);
+ printf("%s: Updated tessellated customdata of dm %p\n", __func__, dm);
dm->dirty &= ~DM_DIRTY_TESS_CDLAYERS;
}
@@ -544,7 +544,7 @@
* which shouuld be fed through the modifier
* stack*/
if (tmp.totvert != me->totvert && !did_shapekeys && me->key) {
- printf("YEEK! this should be recoded! Shape key loss!!!\n");
+ printf("%s: YEEK! this should be recoded! Shape key loss!: ID '%s'\n", __func__, tmp.id.name);
if (tmp.key) tmp.key->id.us--;
tmp.key = NULL;
}
@@ -1300,7 +1300,7 @@
kb->totelem = dm->numVertData;
kb->data = MEM_callocN(sizeof(float)*3*kb->totelem, "kb->data derivedmesh.c");
- fprintf(stderr, "%s: lost a shapekey layer! (bmesh internal error)\n", __func__);
+ fprintf(stderr, "%s: lost a shapekey layer: '%s'! (bmesh internal error)\n", __func__, kb->name);
}
}
}
@@ -1329,8 +1329,8 @@
if (me->totvert != kb->totelem) {
fprintf(stderr,
- "%s: vertex size mismatch (mesh/keyblock) '%s' (%d != %d)\n",
- __func__, me->id.name+2, me->totvert, kb->totelem);
+ "%s: vertex size mismatch (Mesh '%s':%d != KeyBlock '%s':%d)\n",
+ __func__, me->id.name + 2, me->totvert, kb->name, kb->totelem);
array = MEM_callocN(shape_alloc_len, __func__);
}
else {
@@ -3022,7 +3022,7 @@
}
}
else {
- printf("Error during creation polygon infos\n");
+ printf("%s: Error during creation polygon infos\n", __func__);
}
/* clean up */
Modified: trunk/blender/source/blender/blenkernel/intern/mesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/mesh.c 2012-04-12 13:58:16 UTC (rev 45573)
+++ trunk/blender/source/blender/blenkernel/intern/mesh.c 2012-04-12 14:36:57 UTC (rev 45574)
@@ -325,13 +325,16 @@
CustomData_from_bmeshpoly(&me->fdata, &me->pdata, &me->ldata, me->totface);
- /* note: this warning may be un-called for if we are inirializing the mesh for the
- * first time from bmesh, rather then giving a warning about this we could be smarter
- * and check if there was any data to begin with, for now just print the warning with
- * some info to help troubleshoot whats going on - campbell */
- printf("%s: warning! Tessellation uvs or vcol data got out of sync, "
- "had to reset!\n CD_MTFACE: %d != CD_MTEXPOLY: %d || CD_MCOL: %d != CD_MLOOPCOL: %d\n",
- __func__, tottex_tessface, tottex_original, totcol_tessface, totcol_original);
+ /* TODO - add some --debug-mesh option */
+ if (G.debug & G_DEBUG) {
+ /* note: this warning may be un-called for if we are inirializing the mesh for the
+ * first time from bmesh, rather then giving a warning about this we could be smarter
+ * and check if there was any data to begin with, for now just print the warning with
+ * some info to help troubleshoot whats going on - campbell */
+ printf("%s: warning! Tessellation uvs or vcol data got out of sync, "
+ "had to reset!\n CD_MTFACE: %d != CD_MTEXPOLY: %d || CD_MCOL: %d != CD_MLOOPCOL: %d\n",
+ __func__, tottex_tessface, tottex_original, totcol_tessface, totcol_original);
+ }
}
}
}
More information about the Bf-blender-cvs
mailing list