forked from bartvdbraak/blender
Remove DerivedMesh.getFaceMap and create_vert_face_map().
Not used anymore, both have BMesh replacements (DerivedMesh.getPolyMap and create_vert_poly_map.)
This commit is contained in:
parent
bfc331dd75
commit
79fbd39aab
@ -271,10 +271,6 @@ struct DerivedMesh {
|
|||||||
*/
|
*/
|
||||||
struct ListBase *(*getPolyMap)(struct Object *ob, DerivedMesh *dm);
|
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
|
/* Get the BVH used for paint modes
|
||||||
*/
|
*/
|
||||||
struct PBVH *(*getPBVH)(struct Object *ob, DerivedMesh *dm);
|
struct PBVH *(*getPBVH)(struct Object *ob, DerivedMesh *dm);
|
||||||
|
@ -238,8 +238,6 @@ typedef struct IndexNode {
|
|||||||
void create_vert_poly_map(struct ListBase **map, IndexNode **mem,
|
void create_vert_poly_map(struct ListBase **map, IndexNode **mem,
|
||||||
struct MPoly *mface, struct MLoop *mloop,
|
struct MPoly *mface, struct MLoop *mloop,
|
||||||
const int totvert, const int totface, const int totloop);
|
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,
|
void create_vert_edge_map(struct ListBase **map, IndexNode **mem, const struct MEdge *medge,
|
||||||
const int totvert, const int totedge);
|
const int totvert, const int totedge);
|
||||||
|
|
||||||
|
@ -230,20 +230,6 @@ static ListBase *cdDM_getPolyMap(Object *ob, DerivedMesh *dm)
|
|||||||
return cddm->pmap;
|
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)
|
static int can_pbvh_draw(Object *ob, DerivedMesh *dm)
|
||||||
{
|
{
|
||||||
CDDerivedMesh *cddm = (CDDerivedMesh*) dm;
|
CDDerivedMesh *cddm = (CDDerivedMesh*) dm;
|
||||||
@ -1696,7 +1682,6 @@ static CDDerivedMesh *cdDM_create(const char *desc)
|
|||||||
|
|
||||||
dm->getPBVH = cdDM_getPBVH;
|
dm->getPBVH = cdDM_getPBVH;
|
||||||
dm->getPolyMap = cdDM_getPolyMap;
|
dm->getPolyMap = cdDM_getPolyMap;
|
||||||
dm->getFaceMap = cdDM_getFaceMap;
|
|
||||||
|
|
||||||
dm->drawVerts = cdDM_drawVerts;
|
dm->drawVerts = cdDM_drawVerts;
|
||||||
|
|
||||||
|
@ -2096,27 +2096,6 @@ void create_vert_poly_map(ListBase **map, IndexNode **mem,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* 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
|
/* 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
|
of edges that use that vertex as an endpoint. The lists are allocated
|
||||||
from one memory pool. */
|
from one memory pool. */
|
||||||
|
@ -2792,20 +2792,6 @@ static ListBase *ccgDM_getPolyMap(Object *ob, DerivedMesh *dm)
|
|||||||
return ccgdm->pmap;
|
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)
|
static int ccgDM_use_grid_pbvh(CCGDerivedMesh *ccgdm)
|
||||||
{
|
{
|
||||||
MultiresModifierData *mmd= ccgdm->multires.mmd;
|
MultiresModifierData *mmd= ccgdm->multires.mmd;
|
||||||
@ -2973,7 +2959,6 @@ static CCGDerivedMesh *getCCGDerivedMesh(CCGSubSurf *ss,
|
|||||||
ccgdm->dm.getGridAdjacency = ccgDM_getGridAdjacency;
|
ccgdm->dm.getGridAdjacency = ccgDM_getGridAdjacency;
|
||||||
ccgdm->dm.getGridOffset = ccgDM_getGridOffset;
|
ccgdm->dm.getGridOffset = ccgDM_getGridOffset;
|
||||||
ccgdm->dm.getPolyMap = ccgDM_getPolyMap;
|
ccgdm->dm.getPolyMap = ccgDM_getPolyMap;
|
||||||
ccgdm->dm.getFaceMap = ccgDM_getFaceMap;
|
|
||||||
ccgdm->dm.getPBVH = ccgDM_getPBVH;
|
ccgdm->dm.getPBVH = ccgDM_getPBVH;
|
||||||
|
|
||||||
ccgdm->dm.getTessFace = ccgDM_getFinalFace;
|
ccgdm->dm.getTessFace = ccgDM_getFinalFace;
|
||||||
|
Loading…
Reference in New Issue
Block a user