remove assert & make warning print more helpful

2 files changed, 7 insertions, 1 deletions

diff --git a/source/blender/blenkernel/intern/cdderivedmesh.c b/source/blender/blenkernel/intern/cdderivedmesh.c
index 926449427a4..145ed44f19f 100644
--- a/source/blender/blenkernel/intern/cdderivedmesh.c
+++ b/source/blender/blenkernel/intern/cdderivedmesh.c
@@ -1740,7 +1740,11 @@ DerivedMesh *CDDM_from_mesh(Mesh *mesh, Object *UNUSED(ob))
 	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)) {
diff --git a/source/blender/blenkernel/intern/customdata.c b/source/blender/blenkernel/intern/customdata.c
index 48aefde174a..13215635bc7 100644
--- a/source/blender/blenkernel/intern/customdata.c
+++ b/source/blender/blenkernel/intern/customdata.c
@@ -1818,7 +1818,9 @@ void CustomData_copy_data(const CustomData *source, CustomData *dest,
 			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;
 			}