[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42094] branches/bmesh/blender/source/ blender/blenkernel/intern: remove assert & make warning print more helpful
Campbell Barton
ideasman42 at gmail.com
Wed Nov 23 17:39:08 CET 2011
Revision: 42094
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42094
Author: campbellbarton
Date: 2011-11-23 16:39:07 +0000 (Wed, 23 Nov 2011)
Log Message:
-----------
remove assert & make warning print more helpful
Modified Paths:
--------------
branches/bmesh/blender/source/blender/blenkernel/intern/cdderivedmesh.c
branches/bmesh/blender/source/blender/blenkernel/intern/customdata.c
Modified: branches/bmesh/blender/source/blender/blenkernel/intern/cdderivedmesh.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/cdderivedmesh.c 2011-11-23 16:30:50 UTC (rev 42093)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/cdderivedmesh.c 2011-11-23 16:39:07 UTC (rev 42094)
@@ -1740,7 +1740,11 @@
cddm->mpoly = CustomData_get_layer(&dm->polyData, CD_MPOLY);
cddm->mface = CustomData_get_layer(&dm->faceData, CD_MFACE);
+ /* commented since even when CD_POLYINDEX was first added this line fails
+ * on the default cube, (after editmode toggle too) - campbell */
+#if 0
BLI_assert(CustomData_has_layer(&cddm->dm.faceData, CD_POLYINDEX));
+#endif
polyindex = CustomData_get_layer(&dm->faceData, CD_POLYINDEX);
if (!CustomData_has_layer(&cddm->dm.faceData, CD_ORIGINDEX)) {
Modified: branches/bmesh/blender/source/blender/blenkernel/intern/customdata.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/customdata.c 2011-11-23 16:30:50 UTC (rev 42093)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/customdata.c 2011-11-23 16:39:07 UTC (rev 42094)
@@ -1818,7 +1818,9 @@
dest_offset = dest_index * typeInfo->size;
if (!src_data || !dest_data) {
- printf("eek! null data in CustomData_copy_data!\n");
+ printf("%s: warning null data for %s type (%p --> %p), skipping\n",
+ __func__, layerType_getName(source->layers[src_i].type),
+ (void *)src_data, (void *)dest_data);
continue;
}
More information about the Bf-blender-cvs
mailing list