[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [10802] branches/bmesh/source/blender: BMesh Branch
Joseph Eagar
joeedh at gmail.com
Tue May 29 02:13:24 CEST 2007
Revision: 10802
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=10802
Author: joeedh
Date: 2007-05-29 02:13:21 +0200 (Tue, 29 May 2007)
Log Message:
-----------
BMesh Branch
Cleaned up debug printf's, and upped the bmesh subversion to 8.
I figure that what with the refactors, trunk will likely burn
through them.
Sadly, as SoC has started this will be my last bmesh branch
commit for the summer. There's still some annoying bugs with
transform, and also some "pointer not in memlist" errors in
ccdderivedmesh.c and BME_mesh.c.
Modified Paths:
--------------
branches/bmesh/source/blender/blenkernel/BKE_blender.h
branches/bmesh/source/blender/blenkernel/intern/DerivedMesh.c
branches/bmesh/source/blender/blenkernel/intern/cdderivedmesh.c
branches/bmesh/source/blender/blenloader/intern/readfile.c
branches/bmesh/source/blender/src/drawobject.c
branches/bmesh/source/blender/src/editbmesh_interface.c
branches/bmesh/source/blender/src/transform_conversions.c
Modified: branches/bmesh/source/blender/blenkernel/BKE_blender.h
===================================================================
--- branches/bmesh/source/blender/blenkernel/BKE_blender.h 2007-05-28 21:53:49 UTC (rev 10801)
+++ branches/bmesh/source/blender/blenkernel/BKE_blender.h 2007-05-29 00:13:21 UTC (rev 10802)
@@ -44,7 +44,7 @@
struct MemFile;
#define BLENDER_VERSION 244
-#define BLENDER_SUBVERSION 1
+#define BLENDER_SUBVERSION 8
#define BLENDER_MINVERSION 240
#define BLENDER_MINSUBVERSION 0
Modified: branches/bmesh/source/blender/blenkernel/intern/DerivedMesh.c
===================================================================
--- branches/bmesh/source/blender/blenkernel/intern/DerivedMesh.c 2007-05-28 21:53:49 UTC (rev 10801)
+++ branches/bmesh/source/blender/blenkernel/intern/DerivedMesh.c 2007-05-29 00:13:21 UTC (rev 10802)
@@ -695,12 +695,10 @@
/*Eck! remember to write code to set high (which is the transparent highlight color!)*/
if (!emdm->cdraw) emdm->cdraw = bglCacheNew();
- printf("in emDM_recalcDrawCache!\n");
emdm->cdraw->release(emdm->cdraw); /*resets the entire draw cache*/
emdm->cdraw->setMaterials(emdm->cdraw, G.obedit->totcol, G.obedit->mat);
emdm->cdraw->beginCache(emdm->cdraw);
- printf("bleh 1\n");
for (efa=emdm->bmesh->polys.first; efa; efa=efa->next) {
/*do face dot*/
@@ -726,7 +724,6 @@
VECCOPY(no[0], loop->v->no);
VECCOPY(no[1], loop->next->v->no);
VECCOPY(no[2], efa->loopbase->v->no);
- printf("smooth face!\n");
} else {
CalcNormFloat(efa->loopbase->v->co, efa->loopbase->next->v->co,
efa->loopbase->next->next->v->co, nor);
@@ -739,13 +736,11 @@
} while (loop != efa->loopbase->prev);
}
- printf("bleh 2\n");
for (eve=emdm->bmesh->verts.first; eve; eve=eve->next) {
if (eve->flag & SELECT) emdm->cdraw->addVertPoint(emdm->cdraw, eve->co, svcol);
else emdm->cdraw->addVertPoint(emdm->cdraw, eve->co, vcol);
}
- printf("bleh 3\n");
for (eed=emdm->bmesh->edges.first, i=0; eed; i++, eed=eed->next) {
if (eed->flag & SELECT) emdm->cdraw->addEdgeWire(emdm->cdraw, eed->v1->co, eed->v2->co, secol, secol, i);
else emdm->cdraw->addEdgeWire(emdm->cdraw, eed->v1->co, eed->v2->co, ecol, ecol, i);
@@ -769,9 +764,7 @@
EditBMeshDerivedMesh *emdm = (EditBMeshDerivedMesh*) dm;
if (emdm->recalc_cdraw) emDM_recalcDrawCache(emdm);
- printf("drawing!\n");
emdm->cdraw->drawFacesSolid(emdm->cdraw, 0);
- printf("end draw.\n");
}
static void emDM_getMinMax(DerivedMesh *dm, float min_r[3], float max_r[3])
@@ -846,7 +839,6 @@
EditBMeshDerivedMesh *emdm = (EditBMeshDerivedMesh*) dm;
if (DM_release(dm)) {
- printf("stupid free!\n");
if (emdm->cdraw) {
emdm->cdraw->release(emdm->cdraw);
MEM_freeN(emdm->cdraw);
Modified: branches/bmesh/source/blender/blenkernel/intern/cdderivedmesh.c
===================================================================
--- branches/bmesh/source/blender/blenkernel/intern/cdderivedmesh.c 2007-05-28 21:53:49 UTC (rev 10801)
+++ branches/bmesh/source/blender/blenkernel/intern/cdderivedmesh.c 2007-05-29 00:13:21 UTC (rev 10802)
@@ -261,9 +261,6 @@
float *nors= dm->getFaceDataArray(dm, CD_NORMAL);
int a, j, glmode = -1, shademodel = -1, matnr = -1, drawCurrentMat = 1;
- //printf("v: %p f: %p l: %p p: %p\n", mvert, mface, mloop, mpoly);
- //printf("totpolys: %d\n", dm->numPolyData);
-
for (mpoly=cddm->mpoly, a=0; a<dm->numPolyData; a++, mpoly++) {
int new_glmode, new_matnr, new_shademodel;
//printf("poly a: %d\n", a);
@@ -797,7 +794,6 @@
DerivedMesh *dm = &cddm->dm;
int i, *index;
- printf("CDDM_from_mesh() called!!!\n");
/* this does a referenced copy, the only new layers being ORIGINDEX */
DM_init(dm, mesh->totvert, mesh->totedge, mesh->totface, mesh->totloop, mesh->totpoly);
@@ -843,7 +839,6 @@
DerivedMesh *CDDM_from_editmesh(EditMesh *em, Mesh *me)
{
- printf("CCDM_from_editmesh called!\n");
return NULL;
#if 0
DerivedMesh *dm = CDDM_new(BLI_countlist(&em->verts),
Modified: branches/bmesh/source/blender/blenloader/intern/readfile.c
===================================================================
--- branches/bmesh/source/blender/blenloader/intern/readfile.c 2007-05-28 21:53:49 UTC (rev 10801)
+++ branches/bmesh/source/blender/blenloader/intern/readfile.c 2007-05-29 00:13:21 UTC (rev 10802)
@@ -6477,7 +6477,7 @@
}
/*patch meshes*/
- if (main->versionfile <= 244 && main->subversionfile < 1) {
+ if (main->versionfile <= 244 && main->subversionfile < 8) {
/*BMesh Stuff!!*/
Mesh *mesh;
MEdge *medge;
Modified: branches/bmesh/source/blender/src/drawobject.c
===================================================================
--- branches/bmesh/source/blender/src/drawobject.c 2007-05-28 21:53:49 UTC (rev 10801)
+++ branches/bmesh/source/blender/src/drawobject.c 2007-05-29 00:13:21 UTC (rev 10802)
@@ -2003,7 +2003,6 @@
CACHEERROR_CHECK
- printf("in endCache!\n");
self->gl_arena = BLI_memarena_new(1<<13);
for (i=0; i<self->totmat; i++) {
@@ -2073,12 +2072,10 @@
glShadeModel(GL_SMOOTH);
- printf("in draw cache!\n");
glDisableClientState(GL_COLOR_ARRAY);
glEnableClientState(GL_VERTEX_ARRAY);
for (i=0; i<self->totmat; i++) {
- printf("drawing a material group!\n");
group = &self->facegroups[i];
if (group->facenormals) glEnableClientState(GL_NORMAL_ARRAY);
@@ -2091,7 +2088,6 @@
}
glDisableClientState(GL_VERTEX_ARRAY);
- printf("out of draw cache!\n");
glShadeModel(GL_FLAT);
}
Modified: branches/bmesh/source/blender/src/editbmesh_interface.c
===================================================================
--- branches/bmesh/source/blender/src/editbmesh_interface.c 2007-05-28 21:53:49 UTC (rev 10801)
+++ branches/bmesh/source/blender/src/editbmesh_interface.c 2007-05-29 00:13:21 UTC (rev 10802)
@@ -156,11 +156,7 @@
vert_table[i]->no[2] = (float)mvert->no[2] / 32767.0f;
vert_table[i]->flag = mvert->flag;
- printf("->h: %d\n", (int) vert_table[i]->h);
CustomData_to_em_block(&me->vdata, &bmesh->vdata, i, &vert_table[i]->data);
-
- printf("vert_table->no: %f %f %f\n", vert_table[i]->no[0], vert_table[i]->no[1], vert_table[i]->no[2]);
- printf("mvert->no: %d %d %d\n", (int)mvert->no[0], (int)mvert->no[1], (int)mvert->no[2]);
}
for (i=0, medge=me->medge; i<me->totedge; i++, medge++) {
@@ -171,7 +167,6 @@
CustomData_copy(&me->pdata, &bmesh->pdata, CD_MASK_EDITMESH, CD_CALLOC, 0);
for (i=0, mpoly=me->mpoly; i<me->totpoly; i++, mpoly++) {
mloop = &me->mloop[mpoly->firstloop];
- printf("mpoly->firstloop: %d, me->mloop: %p\n", mpoly->firstloop, me->mloop);
for (j=0; j<mpoly->totloop; j++) {
/*hrm. . . a simple scratch pointer array of, oh 6000 length might be better here.*/
PA_AddToArray(&edgearr, edge_table[mloop->edge], j);
@@ -179,7 +174,11 @@
}
poly = BME_MF(bmesh, ((BME_Edge*)edgearr.array[0])->v1, ((BME_Edge*)edgearr.array[0])->v2, (BME_Edge**)edgearr.array, j);
poly->flag = mpoly->flag;
- if (!poly) printf("EVIL POLY NOT CREATED!! EVVVIILL!!\n");
+ if (!poly) {
+ printf("EVIL POLY NOT CREATED!! EVVVIILL!!\n");
+ PA_FreeArray(&edgearr); /*basically sets array length to NULL*/
+ return bmesh;
+ }
PA_FreeArray(&edgearr); /*basically sets array length to NULL*/
CustomData_to_em_block(&me->pdata, &bmesh->pdata, i, &poly->data);
}
@@ -206,7 +205,6 @@
int i, j, curloop=0;
short no[3];
- printf("v: %d e: %d l: %d p: %d\n", bmesh->totvert, bmesh->totedge, bmesh->totloop, bmesh->totpoly);
CustomData_free(&me->vdata, me->totvert);
CustomData_free(&me->edata, me->totedge);
CustomData_free(&me->fdata, me->totface);
@@ -247,11 +245,6 @@
VECCOPY(mvert->no, no);
CustomData_from_em_block(&bmesh->vdata, &me->vdata, bve->data, i);
mvert->flag = bve->flag;
-
- printf("bve->no: %f %f %f\n", bve->no[0], bve->no[1], bve->no[2]);
- printf("bve->no: %d %d %d\n", (int)mvert->no[0], (int)mvert->no[1], (int)mvert->no[2]);
-
- //printf("mesh->co: %f %f %f\n", mvert->co[0], mvert->co[1], mvert->co[2]);
}
/* the edges */
@@ -355,11 +348,9 @@
void mouse_bmesh(void)
{
- printf("in mouse_bmesh()\n");
if (G.scene->selectmode == SCE_SELECT_VERTEX) {
int dis = 75;
BME_Vert *vert = EditBME_FindNearestVert(&dis, 1, 0);
- printf("vert: %p\n", vert);
if (vert) {
if (G.qual & LR_SHIFTKEY) {
if (vert->flag & SELECT) vert->flag &= ~SELECT;
@@ -381,7 +372,6 @@
int dis = 75, stop=0;
edge = EditBME_FindNearestEdge(&dis);
- printf("edge: %p\n", edge);
if (edge) {
if (G.qual & LR_SHIFTKEY) {
Modified: branches/bmesh/source/blender/src/transform_conversions.c
===================================================================
--- branches/bmesh/source/blender/src/transform_conversions.c 2007-05-28 21:53:49 UTC (rev 10801)
+++ branches/bmesh/source/blender/src/transform_conversions.c 2007-05-29 00:13:21 UTC (rev 10802)
@@ -1332,9 +1332,6 @@
//if(G.vd->around==V3D_LOCAL && (G.scene->selectmode & SCE_SELECT_FACE))
// get_face_center(td->center, eve);
- //td->loc[0] = 0.0f;
- //printf("td->loc: %p\n", td->loc);
-
// Setting normals
VECCOPY(td->axismtx[2], eve->no);
td->axismtx[0][0] =
@@ -1436,8 +1433,6 @@
}
}
- printf("count: %d, countsel: %d\n", count, countsel);
-
/* note: in prop mode we need at least 1 selected */
if (countsel==0) return;
@@ -1465,7 +1460,7 @@
if(eve->h==0) {
if(propmode || eve->tflag1) {
VertsToTransData(tob, eve);
- printf("converted! co: [%f, %f, %f], tob: %p\n", tob->loc[0], tob->loc[1], tob->loc[2], tob);
+ //printf("converted! co: [%f, %f, %f], tob: %p\n", tob->loc[0], tob->loc[1], tob->loc[2], tob);
if(eve->tflag1) tob->flag |= TD_SELECTED;
if(propmode) {
tob->flag |= TD_NOTCONNECTED;
More information about the Bf-blender-cvs
mailing list