[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [44499] trunk/blender/source/blender/ blenkernel: Remove DerivedMesh.getFaceMap and create_vert_face_map().
Nicholas Bishop
nicholasbishop at gmail.com
Tue Feb 28 05:00:57 CET 2012
Revision: 44499
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44499
Author: nicholasbishop
Date: 2012-02-28 04:00:56 +0000 (Tue, 28 Feb 2012)
Log Message:
-----------
Remove DerivedMesh.getFaceMap and create_vert_face_map().
Not used anymore, both have BMesh replacements (DerivedMesh.getPolyMap
and create_vert_poly_map.)
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/BKE_DerivedMesh.h
trunk/blender/source/blender/blenkernel/BKE_mesh.h
trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c
trunk/blender/source/blender/blenkernel/intern/mesh.c
trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c
Modified: trunk/blender/source/blender/blenkernel/BKE_DerivedMesh.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_DerivedMesh.h 2012-02-28 03:54:31 UTC (rev 44498)
+++ trunk/blender/source/blender/blenkernel/BKE_DerivedMesh.h 2012-02-28 04:00:56 UTC (rev 44499)
@@ -271,10 +271,6 @@
*/
struct ListBase *(*getPolyMap)(struct Object *ob, DerivedMesh *dm);
- /* Get a map of vertices to faces
- */
- struct ListBase *(*getFaceMap)(struct Object *ob, DerivedMesh *dm);
-
/* Get the BVH used for paint modes
*/
struct PBVH *(*getPBVH)(struct Object *ob, DerivedMesh *dm);
Modified: trunk/blender/source/blender/blenkernel/BKE_mesh.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_mesh.h 2012-02-28 03:54:31 UTC (rev 44498)
+++ trunk/blender/source/blender/blenkernel/BKE_mesh.h 2012-02-28 04:00:56 UTC (rev 44499)
@@ -238,8 +238,6 @@
void create_vert_poly_map(struct ListBase **map, IndexNode **mem,
struct MPoly *mface, struct MLoop *mloop,
const int totvert, const int totface, const int totloop);
-void create_vert_face_map(struct ListBase **map, IndexNode **mem, const struct MFace *mface,
- const int totvert, const int totface);
void create_vert_edge_map(struct ListBase **map, IndexNode **mem, const struct MEdge *medge,
const int totvert, const int totedge);
Modified: trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c 2012-02-28 03:54:31 UTC (rev 44498)
+++ trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c 2012-02-28 04:00:56 UTC (rev 44499)
@@ -230,20 +230,6 @@
return cddm->pmap;
}
-static ListBase *cdDM_getFaceMap(Object *ob, DerivedMesh *dm)
-{
- CDDerivedMesh *cddm = (CDDerivedMesh*) dm;
-
- if(!cddm->fmap && ob->type == OB_MESH) {
- Mesh *me= ob->data;
-
- create_vert_face_map(&cddm->fmap, &cddm->fmap_mem, me->mface,
- me->totvert, me->totface);
- }
-
- return cddm->fmap;
-}
-
static int can_pbvh_draw(Object *ob, DerivedMesh *dm)
{
CDDerivedMesh *cddm = (CDDerivedMesh*) dm;
@@ -1696,7 +1682,6 @@
dm->getPBVH = cdDM_getPBVH;
dm->getPolyMap = cdDM_getPolyMap;
- dm->getFaceMap = cdDM_getFaceMap;
dm->drawVerts = cdDM_drawVerts;
Modified: trunk/blender/source/blender/blenkernel/intern/mesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/mesh.c 2012-02-28 03:54:31 UTC (rev 44498)
+++ trunk/blender/source/blender/blenkernel/intern/mesh.c 2012-02-28 04:00:56 UTC (rev 44499)
@@ -2097,27 +2097,6 @@
}
/* Generates a map where the key is the vertex and the value is a list
- of faces that use that vertex as a corner. The lists are allocated
- from one memory pool. */
-void create_vert_face_map(ListBase **map, IndexNode **mem, const MFace *mface, const int totvert, const int totface)
-{
- int i,j;
- IndexNode *node = NULL;
-
- (*map) = MEM_callocN(sizeof(ListBase) * totvert, "vert face map");
- (*mem) = MEM_callocN(sizeof(IndexNode) * totface*4, "vert face map mem");
- node = *mem;
-
- /* Find the users */
- for (i = 0; i < totface; ++i) {
- for (j = 0; j < (mface[i].v4?4:3); ++j, ++node) {
- node->index = i;
- BLI_addtail(&(*map)[((unsigned int*)(&mface[i]))[j]], node);
- }
- }
-}
-
-/* Generates a map where the key is the vertex and the value is a list
of edges that use that vertex as an endpoint. The lists are allocated
from one memory pool. */
void create_vert_edge_map(ListBase **map, IndexNode **mem, const MEdge *medge, const int totvert, const int totedge)
Modified: trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c 2012-02-28 03:54:31 UTC (rev 44498)
+++ trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c 2012-02-28 04:00:56 UTC (rev 44499)
@@ -2792,20 +2792,6 @@
return ccgdm->pmap;
}
-static ListBase *ccgDM_getFaceMap(Object *ob, DerivedMesh *dm)
-{
- CCGDerivedMesh *ccgdm= (CCGDerivedMesh*)dm;
-
- if(!ccgdm->multires.mmd && !ccgdm->fmap && ob->type == OB_MESH) {
- Mesh *me= ob->data;
-
- create_vert_face_map(&ccgdm->fmap, &ccgdm->fmap_mem, me->mface,
- me->totvert, me->totface);
- }
-
- return ccgdm->fmap;
-}
-
static int ccgDM_use_grid_pbvh(CCGDerivedMesh *ccgdm)
{
MultiresModifierData *mmd= ccgdm->multires.mmd;
@@ -2973,7 +2959,6 @@
ccgdm->dm.getGridAdjacency = ccgDM_getGridAdjacency;
ccgdm->dm.getGridOffset = ccgDM_getGridOffset;
ccgdm->dm.getPolyMap = ccgDM_getPolyMap;
- ccgdm->dm.getFaceMap = ccgDM_getFaceMap;
ccgdm->dm.getPBVH = ccgDM_getPBVH;
ccgdm->dm.getTessFace = ccgDM_getFinalFace;
More information about the Bf-blender-cvs
mailing list