Revision: 44071
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44071
Author: campbellbarton
Date: 2012-02-12 19:11:09 +0000 (Sun, 12 Feb 2012)
Log Message:
-----------
* remove the MFace parts of join (we only need polygon data)
* other minor cleanups
Modified Paths:
--------------
branches/bmesh/blender/source/blender/blenkernel/BKE_mesh.h
branches/bmesh/blender/source/blender/blenkernel/intern/DerivedMesh.c
branches/bmesh/blender/source/blender/blenkernel/intern/cdderivedmesh.c
branches/bmesh/blender/source/blender/blenkernel/intern/mesh.c
branches/bmesh/blender/source/blender/blenloader/intern/readfile.c
branches/bmesh/blender/source/blender/bmesh/operators/bmo_mesh_conv.c
branches/bmesh/blender/source/blender/editors/mesh/mesh_data.c
branches/bmesh/blender/source/blender/editors/mesh/meshtools.c
branches/bmesh/blender/source/blender/editors/sculpt_paint/paint_vertex.c
branches/bmesh/blender/source/blender/editors/sculpt_paint/sculpt.c
branches/bmesh/blender/source/blender/editors/space_view3d/view3d_buttons.c
Modified: branches/bmesh/blender/source/blender/blenkernel/BKE_mesh.h
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/BKE_mesh.h 2012-02-12
19:00:13 UTC (rev 44070)
+++ branches/bmesh/blender/source/blender/blenkernel/BKE_mesh.h 2012-02-12
19:11:09 UTC (rev 44071)
@@ -268,9 +268,9 @@
void BKE_mesh_ensure_navmesh(struct Mesh *me);
-void BKE_mesh_calc_tessface(struct Mesh *mesh);
-void BKE_mesh_ensure_tessface(struct Mesh *mesh);
-void BKE_mesh_clear_tessface(struct Mesh *mesh);
+void BKE_mesh_tessface_calc(struct Mesh *mesh);
+void BKE_mesh_tessface_ensure(struct Mesh *mesh);
+void BKE_mesh_tessface_clear(struct Mesh *mesh);
/*convert a triangle of loop facedata to mface facedata*/
void mesh_loops_to_mface_corners(struct CustomData *fdata, struct CustomData
*ldata,
Modified: branches/bmesh/blender/source/blender/blenkernel/intern/DerivedMesh.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/DerivedMesh.c
2012-02-12 19:00:13 UTC (rev 44070)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/DerivedMesh.c
2012-02-12 19:11:09 UTC (rev 44071)
@@ -446,7 +446,7 @@
/* yes, must be before _and_ after tesselate */
mesh_update_customdata_pointers(&tmp, TRUE);
- BKE_mesh_calc_tessface(&tmp);
+ BKE_mesh_tessface_calc(&tmp);
CustomData_free(&me->vdata, me->totvert);
CustomData_free(&me->edata, me->totedge);
Modified:
branches/bmesh/blender/source/blender/blenkernel/intern/cdderivedmesh.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/cdderivedmesh.c
2012-02-12 19:00:13 UTC (rev 44070)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/cdderivedmesh.c
2012-02-12 19:11:09 UTC (rev 44071)
@@ -232,7 +232,7 @@
Mesh *me= ob->data;
create_vert_face_map(&cddm->fmap, &cddm->fmap_mem, me->mface,
- me->totvert, me->totface);
+ me->totvert, me->totface);
}
return cddm->fmap;
Modified: branches/bmesh/blender/source/blender/blenkernel/intern/mesh.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/mesh.c
2012-02-12 19:00:13 UTC (rev 44070)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/mesh.c
2012-02-12 19:11:09 UTC (rev 44071)
@@ -315,7 +315,7 @@
if (tottex_tessface != tottex_original ||
totcol_tessface != totcol_original )
{
- BKE_mesh_clear_tessface(me);
+ BKE_mesh_tessface_clear(me);
CustomData_from_bmeshpoly(&me->fdata, &me->pdata, &me->ldata,
me->totface);
@@ -2949,7 +2949,7 @@
}
}
-void BKE_mesh_calc_tessface(Mesh *mesh)
+void BKE_mesh_tessface_calc(Mesh *mesh)
{
mesh->totface = mesh_recalcTesselation(&mesh->fdata, &mesh->ldata,
&mesh->pdata,
mesh->mvert,
@@ -2960,14 +2960,14 @@
mesh_update_customdata_pointers(mesh, TRUE);
}
-void BKE_mesh_ensure_tessface(Mesh *mesh)
+void BKE_mesh_tessface_ensure(Mesh *mesh)
{
if (mesh->totpoly && mesh->totface == 0) {
- BKE_mesh_calc_tessface(mesh);
+ BKE_mesh_tessface_calc(mesh);
}
}
-void BKE_mesh_clear_tessface(Mesh *mesh)
+void BKE_mesh_tessface_clear(Mesh *mesh)
{
CustomData_free(&mesh->fdata, mesh->totface);
Modified: branches/bmesh/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- branches/bmesh/blender/source/blender/blenloader/intern/readfile.c
2012-02-12 19:00:13 UTC (rev 44070)
+++ branches/bmesh/blender/source/blender/blenloader/intern/readfile.c
2012-02-12 19:11:09 UTC (rev 44071)
@@ -3703,7 +3703,7 @@
* waiting until edit mode has been entered/exited,
making it easier
* to recognize problems that would otherwise only
show up after edits).
*/
- BKE_mesh_calc_tessface(me);
+ BKE_mesh_tessface_calc(me);
me->id.flag -= LIB_NEEDLINK;
}
Modified: branches/bmesh/blender/source/blender/bmesh/operators/bmo_mesh_conv.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/operators/bmo_mesh_conv.c
2012-02-12 19:00:13 UTC (rev 44070)
+++ branches/bmesh/blender/source/blender/bmesh/operators/bmo_mesh_conv.c
2012-02-12 19:11:09 UTC (rev 44071)
@@ -647,7 +647,7 @@
}
if (dotess) {
- BKE_mesh_calc_tessface(me);
+ BKE_mesh_tessface_calc(me);
}
mesh_update_customdata_pointers(me, dotess);
Modified: branches/bmesh/blender/source/blender/editors/mesh/mesh_data.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/mesh/mesh_data.c
2012-02-12 19:00:13 UTC (rev 44070)
+++ branches/bmesh/blender/source/blender/editors/mesh/mesh_data.c
2012-02-12 19:11:09 UTC (rev 44071)
@@ -759,7 +759,7 @@
BKE_mesh_calc_edges(mesh, calc_edges);
/* TODO, make this optional, we dont always want this! */
- BKE_mesh_calc_tessface(mesh);
+ BKE_mesh_tessface_calc(mesh);
polyindex = CustomData_get_layer(&mesh->fdata, CD_POLYINDEX);
/* add a normals layer for tesselated faces, a tessface normal will
Modified: branches/bmesh/blender/source/blender/editors/mesh/meshtools.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/mesh/meshtools.c
2012-02-12 19:00:13 UTC (rev 44070)
+++ branches/bmesh/blender/source/blender/editors/mesh/meshtools.c
2012-02-12 19:11:09 UTC (rev 44071)
@@ -98,15 +98,14 @@
Mesh *me;
MVert *mvert, *mv;
MEdge *medge = NULL;
- MFace *mface = NULL;
MPoly *mpoly = NULL;
MLoop *mloop = NULL;
Key *key, *nkey=NULL;
KeyBlock *kb, *okb, *kbn;
float imat[4][4], cmat[4][4], *fp1, *fp2, curpos;
- int a, b, totcol, totmat=0, totedge=0, totvert=0, totface=0, ok=0;
+ int a, b, totcol, totmat=0, totedge=0, totvert=0, ok=0;
int totloop=0, totpoly=0, vertofs, *matmap=NULL;
- int i, j, index, haskey=0, edgeofs, faceofs, loopofs, polyofs;
+ int i, j, index, haskey=0, edgeofs, loopofs, polyofs;
bDeformGroup *dg, *odg;
MDeformVert *dvert;
CustomData vdata, edata, fdata, ldata, pdata;
@@ -129,7 +128,6 @@
totvert+= me->totvert;
totedge+= me->totedge;
- totface+= me->totface;
totloop+= me->totloop;
totpoly+= me->totpoly;
totmat+= base->object->totcol;
@@ -290,13 +288,11 @@
mvert= CustomData_add_layer(&vdata, CD_MVERT, CD_CALLOC, NULL, totvert);
medge= CustomData_add_layer(&edata, CD_MEDGE, CD_CALLOC, NULL, totedge);
- mface= CustomData_add_layer(&fdata, CD_MFACE, CD_CALLOC, NULL, totface);
mloop= CustomData_add_layer(&ldata, CD_MLOOP, CD_CALLOC, NULL, totloop);
mpoly= CustomData_add_layer(&pdata, CD_MPOLY, CD_CALLOC, NULL, totpoly);
vertofs= 0;
edgeofs= 0;
- faceofs= 0;
loopofs= 0;
polyofs= 0;
@@ -409,37 +405,6 @@
mvert+= me->totvert;
}
- if(me->totface) {
- /* make mapping for materials */
- for(a=1; a<=base->object->totcol; a++) {
- ma= give_current_material(base->object,
a);
-
- for(b=0; b<totcol; b++) {
- if(ma == matar[b]) {
- matmap[a-1]= b;
- break;
- }
- }
- }
-
- CustomData_merge(&me->fdata, &fdata,
CD_MASK_MESH, CD_DEFAULT, totface);
- CustomData_copy_data(&me->fdata, &fdata, 0,
faceofs, me->totface);
-
- for(a=0; a<me->totface; a++, mface++) {
- mface->v1+= vertofs;
- mface->v2+= vertofs;
- mface->v3+= vertofs;
- if(mface->v4) mface->v4+= vertofs;
-
- if (matmap)
- mface->mat_nr=
matmap[(int)mface->mat_nr];
- else
- mface->mat_nr= 0;
- }
-
- faceofs += me->totface;
- }
-
if(me->totedge) {
CustomData_merge(&me->edata, &edata,
CD_MASK_MESH, CD_DEFAULT, totedge);
CustomData_copy_data(&me->edata, &edata, 0,
edgeofs, me->totedge);
@@ -506,19 +471,16 @@
CustomData_free(&me->vdata, me->totvert);
CustomData_free(&me->edata, me->totedge);
- CustomData_free(&me->fdata, me->totface);
CustomData_free(&me->ldata, me->totloop);
CustomData_free(&me->pdata, me->totpoly);
me->totvert= totvert;
me->totedge= totedge;
- me->totface= totface;
me->totloop= totloop;
me->totpoly= totpoly;
me->vdata= vdata;
me->edata= edata;
- me->fdata= fdata;
me->ldata= ldata;
me->pdata= pdata;
Modified:
branches/bmesh/blender/source/blender/editors/sculpt_paint/paint_vertex.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/sculpt_paint/paint_vertex.c
2012-02-12 19:00:13 UTC (rev 44070)
+++ branches/bmesh/blender/source/blender/editors/sculpt_paint/paint_vertex.c
2012-02-12 19:11:09 UTC (rev 44071)
@@ -375,13 +375,13 @@
}
/* create tessfaces because they will be used for
drawing & fast updates*/
- BKE_mesh_calc_tessface(me); /* does own call to update
pointers */
+ BKE_mesh_tessface_calc(me); /* does own call to update
pointers */
}
}
else {
if (me->totface) {
/* this wont be used, theres no need to keep it */
- BKE_mesh_clear_tessface(me);
+ BKE_mesh_tessface_clear(me);
}
}
@@ -489,7 +489,7 @@
}
/* remove stale me->mcol, will be added later */
- BKE_mesh_clear_tessface(me);
+ BKE_mesh_tessface_clear(me);
DAG_id_tag_update(&me->id, 0);
}
Modified: branches/bmesh/blender/source/blender/editors/sculpt_paint/sculpt.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/sculpt_paint/sculpt.c
2012-02-12 19:00:13 UTC (rev 44070)
+++ branches/bmesh/blender/source/blender/editors/sculpt_paint/sculpt.c
2012-02-12 19:11:09 UTC (rev 44071)
@@ -2724,7 +2724,7 @@
}
/* BMESH ONLY --- at some point we should move sculpt code to use
polygons only - but for now it needs tessfaces */
- BKE_mesh_ensure_tessface(ob->data);
+ BKE_mesh_tessface_ensure(ob->data);
ss->pbvh = dm->getPBVH(ob, dm);
ss->pmap = (need_pmap && dm->getPolyMap)? dm->getPolyMap(ob, dm): NULL;
Modified:
branches/bmesh/blender/source/blender/editors/space_view3d/view3d_buttons.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/space_view3d/view3d_buttons.c
2012-02-12 19:00:13 UTC (rev 44070)
+++ branches/bmesh/blender/source/blender/editors/space_view3d/view3d_buttons.c
2012-02-12 19:11:09 UTC (rev 44071)
@@ -183,7 +183,7 @@
/* check for defgroups */
if(evedef)
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
