[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42253] branches/bmesh/blender/source/ blender: More DM func renames, this one includes renames of the function pointer members of the DerivedMesh struct
Andrew Wiggin
ender79bl at gmail.com
Tue Nov 29 14:02:00 CET 2011
Revision: 42253
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42253
Author: ender79
Date: 2011-11-29 13:01:51 +0000 (Tue, 29 Nov 2011)
Log Message:
-----------
More DM func renames, this one includes renames of the function pointer members of the DerivedMesh struct
Modified Paths:
--------------
branches/bmesh/blender/source/blender/blenkernel/BKE_DerivedMesh.h
branches/bmesh/blender/source/blender/blenkernel/intern/DerivedMesh.c
branches/bmesh/blender/source/blender/blenkernel/intern/anim.c
branches/bmesh/blender/source/blender/blenkernel/intern/cdderivedmesh.c
branches/bmesh/blender/source/blender/blenkernel/intern/dynamicpaint.c
branches/bmesh/blender/source/blender/blenkernel/intern/editderivedbmesh.c
branches/bmesh/blender/source/blender/blenkernel/intern/modifiers_bmesh.c
branches/bmesh/blender/source/blender/blenkernel/intern/subsurf_ccg.c
branches/bmesh/blender/source/blender/editors/mesh/editface.c
branches/bmesh/blender/source/blender/editors/object/object_bake.c
branches/bmesh/blender/source/blender/editors/space_info/info_stats.c
branches/bmesh/blender/source/blender/editors/space_view3d/drawobject.c
branches/bmesh/blender/source/blender/modifiers/intern/MOD_boolean.c
branches/bmesh/blender/source/blender/modifiers/intern/MOD_build.c
branches/bmesh/blender/source/blender/modifiers/intern/MOD_solidify.c
Modified: branches/bmesh/blender/source/blender/blenkernel/BKE_DerivedMesh.h
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/BKE_DerivedMesh.h 2011-11-29 12:12:12 UTC (rev 42252)
+++ branches/bmesh/blender/source/blender/blenkernel/BKE_DerivedMesh.h 2011-11-29 13:01:51 UTC (rev 42253)
@@ -141,7 +141,7 @@
int (*getNumVerts)(DerivedMesh *dm);
int (*getNumEdges)(DerivedMesh *dm);
int (*getNumTessFaces)(DerivedMesh *dm);
- int (*getNumFaces) (DerivedMesh *dm);
+ int (*getNumPolys)(DerivedMesh *dm);
/* copy a single vert/edge/tesselated face from the derived mesh into
* *{vert/edge/face}_r. note that the current implementation
@@ -203,7 +203,7 @@
CustomData *(*getEdgeDataLayout)(DerivedMesh *dm);
CustomData *(*getTessFaceDataLayout)(DerivedMesh *dm);
CustomData *(*getLoopDataLayout)(DerivedMesh *dm);
- CustomData *(*getFaceDataLayout)(DerivedMesh *dm);
+ CustomData *(*getPolyDataLayout)(DerivedMesh *dm);
/*copies all customdata for an element source into dst at index dest*/
void (*copyFromVertCData)(DerivedMesh *dm, int source, CustomData *dst, int dest);
Modified: branches/bmesh/blender/source/blender/blenkernel/intern/DerivedMesh.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/DerivedMesh.c 2011-11-29 12:12:12 UTC (rev 42252)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/DerivedMesh.c 2011-11-29 13:01:51 UTC (rev 42253)
@@ -149,7 +149,7 @@
if (!mpoly) {
mpoly = CustomData_add_layer(&dm->polyData, CD_MPOLY, CD_CALLOC, NULL,
- dm->getNumFaces(dm));
+ dm->getNumPolys(dm));
CustomData_set_layer_flag(&dm->polyData, CD_MPOLY, CD_FLAG_TEMPORARY);
dm->copyPolyArray(dm, mpoly);
}
@@ -250,7 +250,7 @@
dm->getEdgeDataLayout = dm_getEdgeCData;
dm->getTessFaceDataLayout = dm_getFaceCData;
dm->getLoopDataLayout = dm_getLoopCData;
- dm->getFaceDataLayout = dm_getPolyCData;
+ dm->getPolyDataLayout = dm_getPolyCData;
dm->getVertData = DM_get_vert_data;
dm->getEdgeData = DM_get_edge_data;
@@ -365,7 +365,7 @@
totvert = tmp.totvert = dm->getNumVerts(dm);
totedge = tmp.totedge = dm->getNumEdges(dm);
- totpoly = tmp.totpoly = dm->getNumFaces(dm);
+ totpoly = tmp.totpoly = dm->getNumPolys(dm);
totloop = tmp.totloop = dm->numLoopData;
CustomData_copy(&dm->vertData, &tmp.vdata, CD_MASK_MESH, CD_DUPLICATE, totvert);
@@ -2410,7 +2410,7 @@
static DerivedMesh *navmesh_dm_createNavMeshForVisualization(DerivedMesh *dm)
{
DerivedMesh *result;
- int maxFaces = dm->getNumFaces(dm);
+ int maxFaces = dm->getNumPolys(dm);
int *recastData;
int vertsPerPoly=0, nverts=0, ndtris=0, npolys=0;
float* verts=NULL;
Modified: branches/bmesh/blender/source/blender/blenkernel/intern/anim.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/anim.c 2011-11-29 12:12:12 UTC (rev 42252)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/anim.c 2011-11-29 13:01:51 UTC (rev 42253)
@@ -1037,7 +1037,7 @@
dm = mesh_get_derived_deform(scene, par, CD_MASK_BAREMESH);
}
- totface= dm->getNumFaces(dm);
+ totface= dm->getNumPolys(dm);
mpoly= dm->getPolyArray(dm);
mloop= dm->getLoopArray(dm);
mvert= dm->getVertArray(dm);
Modified: branches/bmesh/blender/source/blender/blenkernel/intern/cdderivedmesh.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/cdderivedmesh.c 2011-11-29 12:12:12 UTC (rev 42252)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/cdderivedmesh.c 2011-11-29 13:01:51 UTC (rev 42253)
@@ -112,7 +112,7 @@
return dm->numFaceData;
}
-static int cdDM_getNumFaces(DerivedMesh *dm)
+static int cdDM_getNumPolys(DerivedMesh *dm)
{
return dm->numPolyData;
}
@@ -129,7 +129,7 @@
*edge_r = cddm->medge[index];
}
-static void cdDM_getFace(DerivedMesh *dm, int index, MFace *face_r)
+static void cdDM_getTessFace(DerivedMesh *dm, int index, MFace *face_r)
{
CDDerivedMesh *cddm = (CDDerivedMesh *)dm;
*face_r = cddm->mface[index];
@@ -147,7 +147,7 @@
memcpy(edge_r, cddm->medge, sizeof(*edge_r) * dm->numEdgeData);
}
-static void cdDM_copyFaceArray(DerivedMesh *dm, MFace *face_r)
+static void cdDM_copyTessFaceArray(DerivedMesh *dm, MFace *face_r)
{
CDDerivedMesh *cddm = (CDDerivedMesh *)dm;
memcpy(face_r, cddm->mface, sizeof(*face_r) * dm->numFaceData);
@@ -1631,17 +1631,25 @@
dm->getNumVerts = cdDM_getNumVerts;
dm->getNumEdges = cdDM_getNumEdges;
dm->getNumTessFaces = cdDM_getNumTessFaces;
- dm->getNumFaces = cdDM_getNumFaces;
+ dm->getNumPolys = cdDM_getNumPolys;
dm->getVert = cdDM_getVert;
dm->getEdge = cdDM_getEdge;
- dm->getTessFace = cdDM_getFace;
+ dm->getTessFace = cdDM_getTessFace;
+
dm->copyVertArray = cdDM_copyVertArray;
dm->copyEdgeArray = cdDM_copyEdgeArray;
- dm->copyTessFaceArray = cdDM_copyFaceArray;
+ dm->copyTessFaceArray = cdDM_copyTessFaceArray;
dm->copyLoopArray = cdDM_copyLoopArray;
dm->copyPolyArray = cdDM_copyPolyArray;
+ dm->getVertData = DM_get_vert_data;
+ dm->getEdgeData = DM_get_edge_data;
+ dm->getTessFaceData = DM_get_tessface_data;
+ dm->getVertDataArray = DM_get_vert_data_layer;
+ dm->getEdgeDataArray = DM_get_edge_data_layer;
+ dm->getTessFaceDataArray = DM_get_tessface_data_layer;
+
dm->calcNormals = CDDM_calc_normals;
dm->recalcTesselation = CDDM_recalc_tesselation;
Modified: branches/bmesh/blender/source/blender/blenkernel/intern/dynamicpaint.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/dynamicpaint.c 2011-11-29 12:12:12 UTC (rev 42252)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/dynamicpaint.c 2011-11-29 13:01:51 UTC (rev 42253)
@@ -1668,7 +1668,7 @@
/* Save preview results to weight layer, to be
* able to share same drawing methods */
MFace *mface = result->getTessFaceArray(result);
- int numOfFaces = result->getNumFaces(result);
+ int numOfFaces = result->getNumPolys(result);
int i;
MCol *col = result->getTessFaceDataArray(result, CD_WEIGHT_MCOL);
if (!col) col = CustomData_add_layer(&result->faceData, CD_WEIGHT_MCOL, CD_CALLOC, NULL, numOfFaces);
@@ -2091,7 +2091,7 @@
if (!dm) return setError(canvas, "Canvas mesh not updated.");
if (surface->format != MOD_DPAINT_SURFACE_F_IMAGESEQ) return setError(canvas, "Can't bake non-\"image sequence\" formats.");
- numOfFaces = dm->getNumFaces(dm);
+ numOfFaces = dm->getNumPolys(dm);
mface = dm->getTessFaceArray(dm);
/* get uv map */
Modified: branches/bmesh/blender/source/blender/blenkernel/intern/editderivedbmesh.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/editderivedbmesh.c 2011-11-29 12:12:12 UTC (rev 42252)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/editderivedbmesh.c 2011-11-29 13:01:51 UTC (rev 42253)
@@ -1276,7 +1276,7 @@
return bmdm->tc->tottri;
}
-static int bmDM_getNumFaces(DerivedMesh *dm)
+static int bmDM_getNumPolys(DerivedMesh *dm)
{
EditDerivedBMesh *bmdm= (EditDerivedBMesh*) dm;
@@ -1415,7 +1415,7 @@
}
}
-static void bmDM_copyFaceArray(DerivedMesh *dm, MFace *face_r)
+static void bmDM_copyTessFaceArray(DerivedMesh *dm, MFace *face_r)
{
EditDerivedBMesh *bmdm = (EditDerivedBMesh *)dm;
BMesh *bm = ((EditDerivedBMesh *)dm)->tc->bm;
@@ -1482,7 +1482,7 @@
}
}
-static void *bmDM_getFaceDataArray(DerivedMesh *dm, int type)
+static void *bmDM_getTessFaceDataArray(DerivedMesh *dm, int type)
{
EditDerivedBMesh *bmdm= (EditDerivedBMesh*) dm;
BMesh *bm= bmdm->tc->bm;
@@ -1592,7 +1592,7 @@
return &bmdm->tc->bm->ldata;
}
-static CustomData *bmDm_getFaceDataLayout(DerivedMesh *dm)
+static CustomData *bmDm_getPolyDataLayout(DerivedMesh *dm)
{
EditDerivedBMesh *bmdm = (EditDerivedBMesh*)dm;
@@ -1620,23 +1620,23 @@
bmdm->dm.getEdgeDataLayout = bmDm_getEdgeDataLayout;
bmdm->dm.getTessFaceDataLayout = bmDm_getTessFaceDataLayout;
bmdm->dm.getLoopDataLayout = bmDm_getLoopDataLayout;
- bmdm->dm.getFaceDataLayout = bmDm_getFaceDataLayout;
+ bmdm->dm.getPolyDataLayout = bmDm_getPolyDataLayout;
bmdm->dm.getNumVerts = bmDM_getNumVerts;
bmdm->dm.getNumEdges = bmDM_getNumEdges;
bmdm->dm.getNumTessFaces = bmDM_getNumTessFaces;
- bmdm->dm.getNumFaces = bmDM_getNumFaces;
+ bmdm->dm.getNumPolys = bmDM_getNumPolys;
bmdm->dm.getVert = bmDM_getVert;
bmdm->dm.getEdge = bmDM_getEdge;
bmdm->dm.getTessFace = bmDM_getTessFace;
bmdm->dm.copyVertArray = bmDM_copyVertArray;
bmdm->dm.copyEdgeArray = bmDM_copyEdgeArray;
- bmdm->dm.copyTessFaceArray = bmDM_copyFaceArray;
+ bmdm->dm.copyTessFaceArray = bmDM_copyTessFaceArray;
bmdm->dm.copyLoopArray = bmDM_copyLoopArray;
bmdm->dm.copyPolyArray = bmDM_copyPolyArray;
- bmdm->dm.getTessFaceDataArray = bmDM_getFaceDataArray;
+ bmdm->dm.getTessFaceDataArray = bmDM_getTessFaceDataArray;
bmdm->dm.calcNormals = bmDM_calcNormals;
bmdm->dm.recalcTesselation = bmDM_recalcTesselation;
Modified: branches/bmesh/blender/source/blender/blenkernel/intern/modifiers_bmesh.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/modifiers_bmesh.c 2011-11-29 12:12:12 UTC (rev 42252)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/modifiers_bmesh.c 2011-11-29 13:01:51 UTC (rev 42253)
@@ -138,7 +138,7 @@
totvert = dm->getNumVerts(dm);
totedge = dm->getNumEdges(dm);
- totface = dm->getNumFaces(dm);
+ totface = dm->getNumPolys(dm);
vtable = MEM_callocN(sizeof(void**)*totvert, "vert table in BMDM_Copy");
etable = MEM_callocN(sizeof(void**)*totedge, "edge table in BMDM_Copy");
Modified: branches/bmesh/blender/source/blender/blenkernel/intern/subsurf_ccg.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/subsurf_ccg.c 2011-11-29 12:12:12 UTC (rev 42252)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/subsurf_ccg.c 2011-11-29 13:01:51 UTC (rev 42253)
@@ -223,7 +223,7 @@
MLoop *mloop = dm->getLoopArray(dm);
MVert *mvert = dm->getVertArray(dm);
int totvert = dm->getNumVerts(dm);
- int totface = dm->getNumFaces(dm);
+ int totface = dm->getNumPolys(dm);
int i, j, seam;
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list