diff options
Diffstat (limited to 'source/blender/blenkernel/intern')
-rw-r--r-- | source/blender/blenkernel/intern/DerivedMesh.c | 81 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/bvhutils.c | 1 |
2 files changed, 0 insertions, 82 deletions
diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c index 5a99978f00c..e4ab70e52b3 100644 --- a/source/blender/blenkernel/intern/DerivedMesh.c +++ b/source/blender/blenkernel/intern/DerivedMesh.c @@ -2990,84 +2990,3 @@ bool DM_is_valid(DerivedMesh *dm) } #endif /* NDEBUG */ - -/* -------------------------------------------------------------------- */ - -MVert *DM_get_vert_array(DerivedMesh *dm, bool *allocated) -{ - CustomData *vert_data = dm->getVertDataLayout(dm); - MVert *mvert = CustomData_get_layer(vert_data, CD_MVERT); - *allocated = false; - - if (mvert == NULL) { - mvert = MEM_malloc_arrayN(dm->getNumVerts(dm), sizeof(MVert), "dmvh vert data array"); - dm->copyVertArray(dm, mvert); - *allocated = true; - } - - return mvert; -} - -MEdge *DM_get_edge_array(DerivedMesh *dm, bool *allocated) -{ - CustomData *edge_data = dm->getEdgeDataLayout(dm); - MEdge *medge = CustomData_get_layer(edge_data, CD_MEDGE); - *allocated = false; - - if (medge == NULL) { - medge = MEM_malloc_arrayN(dm->getNumEdges(dm), sizeof(MEdge), "dm medge data array"); - dm->copyEdgeArray(dm, medge); - *allocated = true; - } - - return medge; -} - -MLoop *DM_get_loop_array(DerivedMesh *dm, bool *r_allocated) -{ - CustomData *loop_data = dm->getLoopDataLayout(dm); - MLoop *mloop = CustomData_get_layer(loop_data, CD_MLOOP); - *r_allocated = false; - - if (mloop == NULL) { - mloop = MEM_malloc_arrayN(dm->getNumLoops(dm), sizeof(MLoop), "dm loop data array"); - dm->copyLoopArray(dm, mloop); - *r_allocated = true; - } - - return mloop; -} - -MPoly *DM_get_poly_array(DerivedMesh *dm, bool *r_allocated) -{ - CustomData *poly_data = dm->getPolyDataLayout(dm); - MPoly *mpoly = CustomData_get_layer(poly_data, CD_MPOLY); - *r_allocated = false; - - if (mpoly == NULL) { - mpoly = MEM_malloc_arrayN(dm->getNumPolys(dm), sizeof(MPoly), "dm poly data array"); - dm->copyPolyArray(dm, mpoly); - *r_allocated = true; - } - - return mpoly; -} - -MFace *DM_get_tessface_array(DerivedMesh *dm, bool *r_allocated) -{ - CustomData *tessface_data = dm->getTessFaceDataLayout(dm); - MFace *mface = CustomData_get_layer(tessface_data, CD_MFACE); - *r_allocated = false; - - if (mface == NULL) { - int numTessFaces = dm->getNumTessFaces(dm); - - if (numTessFaces > 0) { - mface = MEM_malloc_arrayN(numTessFaces, sizeof(MFace), "bvh mface data array"); - dm->copyTessFaceArray(dm, mface); - *r_allocated = true; - } - } - - return mface; -} diff --git a/source/blender/blenkernel/intern/bvhutils.c b/source/blender/blenkernel/intern/bvhutils.c index 15c7ba54732..5c27b1b6207 100644 --- a/source/blender/blenkernel/intern/bvhutils.c +++ b/source/blender/blenkernel/intern/bvhutils.c @@ -469,7 +469,6 @@ static void bvhtree_from_mesh_verts_setup_data( data->vert = vert; data->vert_allocated = vert_allocated; - //data->face = DM_get_tessface_array(dm, &data->face_allocated); /* XXX WHY???? */ } /* Builds a bvh tree where nodes are the vertices of the given em */ |