[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40518] branches/bmesh/blender/source/ blender: make error prints more helpful & correct some comments for rip code.
Campbell Barton
ideasman42 at gmail.com
Sat Sep 24 14:13:15 CEST 2011
Revision: 40518
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40518
Author: campbellbarton
Date: 2011-09-24 12:13:13 +0000 (Sat, 24 Sep 2011)
Log Message:
-----------
make error prints more helpful & correct some comments for rip code.
Modified Paths:
--------------
branches/bmesh/blender/source/blender/blenkernel/intern/DerivedMesh.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_newcore.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_operators.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_polygon.c
branches/bmesh/blender/source/blender/bmesh/operators/bevel.c
branches/bmesh/blender/source/blender/bmesh/operators/connectops.c
branches/bmesh/blender/source/blender/bmesh/operators/createops.c
branches/bmesh/blender/source/blender/bmesh/operators/edgesplitop.c
branches/bmesh/blender/source/blender/bmesh/operators/mesh_conv.c
branches/bmesh/blender/source/blender/editors/mesh/bmeshutils.c
branches/bmesh/blender/source/blender/editors/mesh/knifetool.c
branches/bmesh/blender/source/blender/modifiers/intern/MOD_solidify.c
Modified: branches/bmesh/blender/source/blender/blenkernel/intern/DerivedMesh.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/DerivedMesh.c 2011-09-24 11:42:11 UTC (rev 40517)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/DerivedMesh.c 2011-09-24 12:13:13 UTC (rev 40518)
@@ -1038,7 +1038,7 @@
kb->totelem = dm->numVertData;
kb->data = MEM_callocN(sizeof(float)*3*kb->totelem, "kb->data derivedmesh.c");
- printf("eek! lost a shapekey layer!\n");
+ fprintf(stderr, "%s: lost a shapekey layer! (bmesh internal error)\n", __func__);
}
}
}
Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_newcore.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_newcore.c 2011-09-24 11:42:11 UTC (rev 40517)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_newcore.c 2011-09-24 12:13:13 UTC (rev 40518)
@@ -282,7 +282,7 @@
if (l->v->head.type != BM_VERT)
err |= 1024;
if (!BM_Vert_In_Edge(l->e, l->v)) {
- printf("eek!! fatal bmesh error! evil!\n");
+ fprintf(stderr, "%s: fatal bmesh error (vert not in edge)! (bmesh internal error)\n", __func__);
err |= 2048;
}
@@ -321,7 +321,7 @@
l = bm_firstfaceloop(f);
do {
if (l->f != f) {
- printf("yeek!! loop inside one face points to another!\n");
+ fprintf(stderr, "%s: loop inside one face points to another! (bmesh internal error)\n", __func__);
err |= (1<<17);
}
Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_operators.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_operators.c 2011-09-24 11:42:11 UTC (rev 40517)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_operators.c 2011-09-24 12:13:13 UTC (rev 40518)
@@ -291,7 +291,7 @@
} else if (size == 3) {
copy_m4_m3(slot->data.p, (float (*)[3])mat);
} else {
- printf("yeek! invalid size in BMO_Set_Mat!\n");
+ fprintf(stderr, "%s: invalid size argument %d (bmesh internal error)\n", __func__, size);
memset(slot->data.p, 0, sizeof(float)*4*4);
return;
@@ -1069,8 +1069,8 @@
for (i=0; def->slottypes[i].type; i++) {
if (!strcmp(name, def->slottypes[i].name)) return i;
}
-
- printf("yeek! could not find bmesh slot for name %s!\n", name);
+
+ fprintf(stderr, "%s: ! could not find bmesh slot for name %s! (bmesh internal error)\n", __func__, name);
return 0;
}
@@ -1082,7 +1082,7 @@
if (!strcmp(name, def->slottypes[i].name)) return i;
}
- printf("yeek! could not find bmesh slot for name %s!\n", name);
+ fprintf(stderr, "%s: ! could not find bmesh slot for name %s! (bmesh internal error)\n", __func__, name);
return -1;
}
@@ -1094,7 +1094,7 @@
}
if (i == bmesh_total_ops) {
- printf("yeek!! invalid op name %s!\n", opname);
+ fprintf(stderr, "%s: ! could not find bmesh slot for name %s! (bmesh internal error)\n", __func__, opname);
return 0;
}
Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_polygon.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_polygon.c 2011-09-24 11:42:11 UTC (rev 40517)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_polygon.c 2011-09-24 12:13:13 UTC (rev 40518)
@@ -786,7 +786,7 @@
copy_v3_v3(f->no, l->f->no);
if (!f) {
- printf("yeek! triangulator failed to split face!\n");
+ fprintf(stderr, "%s: triangulator failed to split face! (bmesh internal error)\n", __func__);
break;
}
Modified: branches/bmesh/blender/source/blender/bmesh/operators/bevel.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/operators/bevel.c 2011-09-24 11:42:11 UTC (rev 40517)
+++ branches/bmesh/blender/source/blender/bmesh/operators/bevel.c 2011-09-24 12:13:13 UTC (rev 40518)
@@ -541,7 +541,7 @@
}
if (!f) {
- printf("eek!\n");
+ fprintf(stderr, "%s: face index out of range! (bmesh internal error)\n", __func__);
continue;
}
@@ -716,9 +716,10 @@
f = BM_Make_Ngon(bm, lastv, vstart, edges, BLI_array_count(edges), 0);
if (!f) {
- printf("eek! in bevel vert fill!\n");
- } else
+ fprintf(stderr, "%s: in bevel vert fill! (bmesh internal error)\n", __func__);
+ } else {
BMO_SetFlag(bm, f, FACE_NEW|FACE_HOLE);
+ }
}
BLI_smallhash_release(&tmphash);
}
Modified: branches/bmesh/blender/source/blender/bmesh/operators/connectops.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/operators/connectops.c 2011-09-24 11:42:11 UTC (rev 40517)
+++ branches/bmesh/blender/source/blender/bmesh/operators/connectops.c 2011-09-24 12:13:13 UTC (rev 40518)
@@ -145,7 +145,7 @@
BMEdge *e2, *e3;
if (c > 2) {
- printf("eek! more than two edge loops!\n");
+ fprintf(stderr, "%s: more than two edge loops! (bmesh internal error)\n", __func__);
break;
}
@@ -264,7 +264,7 @@
f = BM_Make_QuadTri(bm, vv1[(i + starti)%lenv1], vv2[i], vv2[(i+1)%lenv2], vv1[(i+1 + starti)%lenv1], NULL, 1);
if (!f || f->len != 4) {
- printf("eek in bridge!\n");
+ fprintf(stderr, "%s: in bridge! (bmesh internal error)\n", __func__);
}
j++;
Modified: branches/bmesh/blender/source/blender/bmesh/operators/createops.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/operators/createops.c 2011-09-24 11:42:11 UTC (rev 40517)
+++ branches/bmesh/blender/source/blender/bmesh/operators/createops.c 2011-09-24 12:13:13 UTC (rev 40518)
@@ -492,7 +492,7 @@
s1 = STRAIGHT(vec1, vec2); s2 = STRAIGHT(vec2, vec3); s3 = STRAIGHT(vec1, vec3);
if (s1 || s2 || s3) {
- printf("yeek! s1: %d, s2: %d, s3: %dx\n", s1, s2, s3);
+ fprintf(stderr, "%s: s1: %d, s2: %d, s3: %dx (bmesh internal error)\n", __func__, s1, s2, s3);
}
if (dot_v3v3(n1, n2) < 0.0f) {
if (dot_v3v3(n1, n3) >= 0.0f + FLT_EPSILON*10) {
Modified: branches/bmesh/blender/source/blender/bmesh/operators/edgesplitop.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/operators/edgesplitop.c 2011-09-24 11:42:11 UTC (rev 40517)
+++ branches/bmesh/blender/source/blender/bmesh/operators/edgesplitop.c 2011-09-24 12:13:13 UTC (rev 40518)
@@ -65,8 +65,7 @@
#define FACE_DEL 1
#define FACE_NEW 2
-#define EDGE_BUF_SIZE 100
-static BMFace *remake_face(BMesh *bm, EdgeTag *etags, BMFace *f, BMVert **verts, BMEdge **edges)
+static BMFace *remake_face(BMesh *bm, EdgeTag *etags, BMFace *f, BMVert **verts, BMEdge **edges_tmp)
{
BMIter liter1, liter2;
EdgeTag *et;
@@ -86,12 +85,12 @@
if (!e) {
return NULL;
}
- edges[i] = e;
+ edges_tmp[i] = e;
}
- edges[i] = BM_Make_Edge(bm, lastv1, lastv2, NULL, 1);
+ edges_tmp[i] = BM_Make_Edge(bm, lastv1, lastv2, NULL, 1);
- f2 = BM_Make_Face(bm, verts, edges, f->len);
+ f2 = BM_Make_Face(bm, verts, edges_tmp, f->len);
if (!f2) {
return NULL;
}
@@ -217,8 +216,8 @@
BMEdge *e, *e2;
BMVert *v, *v2, **verts = NULL;
BLI_array_declare(verts);
- BMEdge **edges = NULL;
- BLI_array_declare(edges);
+ BMEdge **edges_tmp = NULL;
+ BLI_array_declare(edges_tmp);
int i, j;
BMO_Flag_Buffer(bm, op, "edges", EDGE_SEAM, BM_EDGE);
@@ -270,9 +269,11 @@
BLI_array_growitems(verts, f->len);
memset(verts, 0, sizeof(BMVert*)*f->len);
- BLI_array_empty(edges);
- BLI_array_growitems(edges, f->len);
-
+ /* this is passed onto remake_face() so it doesnt need to allocate
+ * a new array on each call. */
+ BLI_array_empty(edges_tmp);
+ BLI_array_growitems(edges_tmp, f->len);
+
i = 0;
BM_ITER(l, &liter, bm, BM_LOOPS_OF_FACE, f) {
if (!BMO_TestFlag(bm, l->e, EDGE_SEAM)) {
@@ -389,7 +390,7 @@
}
#endif
- f2 = remake_face(bm, etags, f, verts, edges); /* clobbers 'verts', */
+ f2 = remake_face(bm, etags, f, verts, edges_tmp);
if (!f2) {
continue;
}
@@ -417,7 +418,7 @@
BMO_Flag_To_Slot(bm, op, "edgeout2", EDGE_RET2, BM_EDGE);
BLI_array_free(verts);
- BLI_array_free(edges);
+ BLI_array_free(edges_tmp);
if (etags) MEM_freeN(etags);
}
Modified: branches/bmesh/blender/source/blender/bmesh/operators/mesh_conv.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/operators/mesh_conv.c 2011-09-24 11:42:11 UTC (rev 40517)
+++ branches/bmesh/blender/source/blender/bmesh/operators/mesh_conv.c 2011-09-24 12:13:13 UTC (rev 40518)
@@ -99,7 +99,7 @@
this also exists in the file reading code, but is here for
a sanity check*/
if (!me->key->uidgen) {
- printf("yeek! had to generate shape key uid's in a situation we shouldn't need to!\n");
+ fprintf(stderr, "%s had to generate shape key uid's in a situation we shouldn't need to! (bmesh internal error)\n", __func__);
me->key->uidgen = 1;
for (block=me->key->block.first; block; block=block->next) {
block->uid = me->key->uidgen++;
Modified: branches/bmesh/blender/source/blender/editors/mesh/bmeshutils.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/mesh/bmeshutils.c 2011-09-24 11:42:11 UTC (rev 40517)
+++ branches/bmesh/blender/source/blender/editors/mesh/bmeshutils.c 2011-09-24 12:13:13 UTC (rev 40518)
@@ -268,7 +268,7 @@
BMesh *bm;
if (!me->mpoly && me->totface) {
- printf("yeek!! bmesh conversion issue! may lose lots of geometry!\n");
+ fprintf(stderr, "%s: bmesh conversion issue! may lose lots of geometry! (bmesh internal error)\n", __func__);
/*BMESH_TODO need to write smarter code here*/
bm = BKE_mesh_to_bmesh(me, ob);
Modified: branches/bmesh/blender/source/blender/editors/mesh/knifetool.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/mesh/knifetool.c 2011-09-24 11:42:11 UTC (rev 40517)
+++ branches/bmesh/blender/source/blender/editors/mesh/knifetool.c 2011-09-24 12:13:13 UTC (rev 40518)
@@ -1551,7 +1551,7 @@
f2 = faces[BM_GetIndex(f)];
if (BM_GetIndex(f) < 0 || BM_GetIndex(f) >= totface) {
- printf("eek!!\n");
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list