From 5aa72b87262c1dd310c5dba7cd772b3d6b02a427 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 9 Feb 2011 15:13:20 +0000 Subject: BKE_mesh_validate() now corrects invalid meshes (optionally), added access for python so it can correct for bad imported geometry - mesh.validate(). --- source/blender/blenkernel/BKE_mesh.h | 6 +- source/blender/blenkernel/intern/mesh.c | 17 ++ source/blender/blenkernel/intern/mesh_validate.c | 355 ++++++++++++++++------- source/blender/editors/mesh/mesh_data.c | 69 +---- source/blender/makesrna/intern/rna_mesh_api.c | 2 - 5 files changed, 273 insertions(+), 176 deletions(-) diff --git a/source/blender/blenkernel/BKE_mesh.h b/source/blender/blenkernel/BKE_mesh.h index 85b5ec96275..f5e8901ac70 100644 --- a/source/blender/blenkernel/BKE_mesh.h +++ b/source/blender/blenkernel/BKE_mesh.h @@ -89,7 +89,9 @@ void mesh_get_texspace(struct Mesh *me, float *loc_r, float *rot_r, float *size_ /* if old, it converts mface->edcode to edge drawflags */ void make_edges(struct Mesh *me, int old); + void mesh_strip_loose_faces(struct Mesh *me); +void mesh_strip_loose_edges(struct Mesh *me); /* Calculate vertex and face normals, face normals are returned in *faceNors_r if non-NULL * and vertex normals are stored in actual mverts. @@ -150,10 +152,12 @@ int mesh_center_bounds(struct Mesh *me, float cent[3]); void mesh_translate(struct Mesh *me, float offset[3], int do_keys); /* mesh_validate.c */ -void BKE_mesh_validate_arrays(struct MVert *mverts, int totvert, struct MEdge *medges, int totedge, struct MFace *mfaces, int totface); +void BKE_mesh_validate_arrays(struct Mesh *me, struct MVert *mverts, int totvert, struct MEdge *medges, int totedge, struct MFace *mfaces, int totface, const short do_verbose, const short do_fixes); void BKE_mesh_validate(struct Mesh *me); void BKE_mesh_validate_dm(struct DerivedMesh *dm); +void BKE_mesh_calc_edges(struct Mesh *mesh, int update); + #ifdef __cplusplus } #endif diff --git a/source/blender/blenkernel/intern/mesh.c b/source/blender/blenkernel/intern/mesh.c index d948b049881..7ae3e73d919 100644 --- a/source/blender/blenkernel/intern/mesh.c +++ b/source/blender/blenkernel/intern/mesh.c @@ -704,6 +704,23 @@ void mesh_strip_loose_faces(Mesh *me) me->totface = b; } +void mesh_strip_loose_edges(Mesh *me) +{ + int a,b; + + for (a=b=0; atotedge; a++) { + if (me->medge[a].v1==me->medge[a].v2) { + if (a!=b) { + memcpy(&me->medge[b],&me->medge[a],sizeof(me->medge[b])); + CustomData_copy_data(&me->edata, &me->edata, a, b, 1); + CustomData_free_elem(&me->edata, a, 1); + } + b++; + } + } + me->totedge = b; +} + void mball_to_mesh(ListBase *lb, Mesh *me) { DispList *dl; diff --git a/source/blender/blenkernel/intern/mesh_validate.c b/source/blender/blenkernel/intern/mesh_validate.c index 9cec9da15ba..84b7307b820 100644 --- a/source/blender/blenkernel/intern/mesh_validate.c +++ b/source/blender/blenkernel/intern/mesh_validate.c @@ -31,6 +31,8 @@ #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" +#include "BLO_sys_types.h" + #include "BLI_utildefines.h" #include "BLI_edgehash.h" @@ -38,13 +40,47 @@ #include "MEM_guardedalloc.h" -#include "ED_mesh.h" +#include "BKE_mesh.h" + +#define SELECT 1 typedef struct SearchFace { unsigned int v[4]; unsigned int index; } SearchFace; +typedef union { + uint32_t verts[2]; + int64_t edval; +} EdgeStore; + +static void edge_store_assign(uint32_t verts[2], const uint32_t v1, const uint32_t v2) +{ + if(v1 < v2) { + verts[0]= v1; + verts[1]= v2; + } + else { + verts[0]= v2; + verts[1]= v1; + } +} + +static void edge_store_from_mface_quad(EdgeStore es[3], MFace *mf) +{ + edge_store_assign(es[0].verts, mf->v1, mf->v2); + edge_store_assign(es[1].verts, mf->v2, mf->v3); + edge_store_assign(es[2].verts, mf->v3, mf->v4); + edge_store_assign(es[2].verts, mf->v4, mf->v1); +} + +static void edge_store_from_mface_tri(EdgeStore es[3], MFace *mf) +{ + edge_store_assign(es[0].verts, mf->v1, mf->v2); + edge_store_assign(es[1].verts, mf->v2, mf->v3); + edge_store_assign(es[2].verts, mf->v3, mf->v1); +} + static int uint_cmp(const void *v1, const void *v2) { const unsigned int x1= GET_INT_FROM_POINTER(v1), x2= GET_INT_FROM_POINTER(v2); @@ -73,187 +109,296 @@ static int search_face_cmp(const void *v1, const void *v2) return 0; } -void BKE_mesh_validate_arrays(MVert *UNUSED(mverts), int totvert, MEdge *medges, int totedge, MFace *mfaces, int totface) +void BKE_mesh_validate_arrays(Mesh *me, MVert *UNUSED(mverts), int totvert, MEdge *medges, int totedge, MFace *mfaces, int totface, const short do_verbose, const short do_fixes) { +# define PRINT if(do_verbose) printf +# define REMOVE_EDGE_TAG(_med) { _med->v2= _med->v1; do_edge_free= 1; } +# define REMOVE_FACE_TAG(_mf) { _mf->v3=0; do_face_free= 1; } + // MVert *mv; MEdge *med; MFace *mf; int i; + int do_face_free= FALSE; + int do_edge_free= FALSE; + + int do_edge_recalc= FALSE; + EdgeHash *edge_hash = BLI_edgehash_new(); SearchFace *search_faces= MEM_callocN(sizeof(SearchFace) * totface, "search faces"); SearchFace *sf; SearchFace *sf_prev; + int totsearchface= 0; - printf("ED_mesh_validate: verts(%d), edges(%d), faces(%d)\n", totvert, totedge, totface); + BLI_assert(!(do_fixes && me == NULL)); - if(totedge==0 && totface != 0) { - printf(" locical error, %d faces and 0 edges\n", totface); + PRINT("ED_mesh_validate: verts(%d), edges(%d), faces(%d)\n", totvert, totedge, totface); + + if(totedge == 0 && totface != 0) { + PRINT(" locical error, %d faces and 0 edges\n", totface); + do_edge_recalc= TRUE; } - for(i=0, med=medges; iv1 == med->v2) { - printf(" edge %d: has matching verts, both %d\n", i, med->v1); + PRINT(" edge %d: has matching verts, both %d\n", i, med->v1); + remove= do_fixes; } - if(med->v1 < 0 || med->v1 >= totvert) { - printf(" edge %d: v1 index out of range, %d\n", i, med->v1); + if(med->v1 >= totvert) { + PRINT(" edge %d: v1 index out of range, %d\n", i, med->v1); + remove= do_fixes; } - if(med->v2 < 0 || med->v2 >= totvert) { - printf(" edge %d: v2 index out of range, %d\n", i, med->v2); + if(med->v2 >= totvert) { + PRINT(" edge %d: v2 index out of range, %d\n", i, med->v2); + remove= do_fixes; } if(BLI_edgehash_haskey(edge_hash, med->v1, med->v2)) { - printf(" edge %d: is a duplicate of, %d\n", i, GET_INT_FROM_POINTER(BLI_edgehash_lookup(edge_hash, med->v1, med->v2))); + PRINT(" edge %d: is a duplicate of, %d\n", i, GET_INT_FROM_POINTER(BLI_edgehash_lookup(edge_hash, med->v1, med->v2))); + remove= do_fixes; } - BLI_edgehash_insert(edge_hash, med->v1, med->v2, SET_INT_IN_POINTER(i)); + if(remove == FALSE){ + BLI_edgehash_insert(edge_hash, med->v1, med->v2, SET_INT_IN_POINTER(i)); + } + else { + REMOVE_EDGE_TAG(med); + } } for(i=0, mf=mfaces; iv4 ? 3:2; do { fverts[fidx]= *(&mf->v1 + fidx); - if(fverts[fidx] < 0 || fverts[fidx] >= totvert) { - printf(" face %d: 'v%d' index out of range, %d\n", i, fidx + 1, fverts[fidx]); + if(fverts[fidx] >= totvert) { + PRINT(" face %d: 'v%d' index out of range, %d\n", i, fidx + 1, fverts[fidx]); + remove= do_fixes; } } while (fidx--); - if(mf->v4) { - if(mf->v1 == mf->v2) printf(" face %d: verts invalid, v1/v2 both %d\n", i, mf->v1); - if(mf->v1 == mf->v3) printf(" face %d: verts invalid, v1/v3 both %d\n", i, mf->v1); - if(mf->v1 == mf->v4) printf(" face %d: verts invalid, v1/v4 both %d\n", i, mf->v1); + if(remove == FALSE) { + if(mf->v4) { + if(mf->v1 == mf->v2) { PRINT(" face %d: verts invalid, v1/v2 both %d\n", i, mf->v1); remove= do_fixes; } + if(mf->v1 == mf->v3) { PRINT(" face %d: verts invalid, v1/v3 both %d\n", i, mf->v1); remove= do_fixes; } + if(mf->v1 == mf->v4) { PRINT(" face %d: verts invalid, v1/v4 both %d\n", i, mf->v1); remove= do_fixes; } - if(mf->v2 == mf->v3) printf(" face %d: verts invalid, v2/v3 both %d\n", i, mf->v2); - if(mf->v2 == mf->v4) printf(" face %d: verts invalid, v2/v4 both %d\n", i, mf->v2); + if(mf->v2 == mf->v3) { PRINT(" face %d: verts invalid, v2/v3 both %d\n", i, mf->v2); remove= do_fixes; } + if(mf->v2 == mf->v4) { PRINT(" face %d: verts invalid, v2/v4 both %d\n", i, mf->v2); remove= do_fixes; } - if(mf->v3 == mf->v4) printf(" face %d: verts invalid, v3/v4 both %d\n", i, mf->v3); + if(mf->v3 == mf->v4) { PRINT(" face %d: verts invalid, v3/v4 both %d\n", i, mf->v3); remove= do_fixes; } + } + else { + if(mf->v1 == mf->v2) { PRINT(" faceT %d: verts invalid, v1/v2 both %d\n", i, mf->v1); remove= do_fixes; } + if(mf->v1 == mf->v3) { PRINT(" faceT %d: verts invalid, v1/v3 both %d\n", i, mf->v1); remove= do_fixes; } - if(totedge) { - if(!BLI_edgehash_haskey(edge_hash, mf->v1, mf->v2)) printf(" face %d: edge v1/v2 (%d,%d) is missing egde data\n", i, mf->v1, mf->v2); - if(!BLI_edgehash_haskey(edge_hash, mf->v2, mf->v3)) printf(" face %d: edge v2/v3 (%d,%d) is missing egde data\n", i, mf->v2, mf->v3); - if(!BLI_edgehash_haskey(edge_hash, mf->v3, mf->v4)) printf(" face %d: edge v3/v4 (%d,%d) is missing egde data\n", i, mf->v3, mf->v4); - if(!BLI_edgehash_haskey(edge_hash, mf->v4, mf->v1)) printf(" face %d: edge v4/v1 (%d,%d) is missing egde data\n", i, mf->v4, mf->v1); + if(mf->v2 == mf->v3) { PRINT(" faceT %d: verts invalid, v2/v3 both %d\n", i, mf->v2); remove= do_fixes; } } - /* TODO, avoid double lookop */ - /* - fedges[0]= GET_INT_FROM_POINTER(BLI_edgehash_lookup(edge_hash, mf->v1, mf->v2)); - fedges[1]= GET_INT_FROM_POINTER(BLI_edgehash_lookup(edge_hash, mf->v2, mf->v3)); - fedges[2]= GET_INT_FROM_POINTER(BLI_edgehash_lookup(edge_hash, mf->v3, mf->v4)); - fedges[3]= GET_INT_FROM_POINTER(BLI_edgehash_lookup(edge_hash, mf->v4, mf->v1)); - */ - qsort(fverts, 4, sizeof(int), uint_cmp); - } - else { - if(mf->v1 == mf->v2) printf(" face %d: verts invalid, v1/v2 both %d\n", i, mf->v1); - if(mf->v1 == mf->v3) printf(" face %d: verts invalid, v1/v3 both %d\n", i, mf->v1); - if(mf->v2 == mf->v3) printf(" face %d: verts invalid, v2/v3 both %d\n", i, mf->v2); + if(remove == FALSE) { + if(totedge) { + if(mf->v4) { + if(!BLI_edgehash_haskey(edge_hash, mf->v1, mf->v2)) { PRINT(" face %d: edge v1/v2 (%d,%d) is missing egde data\n", i, mf->v1, mf->v2); do_edge_recalc= TRUE; } + if(!BLI_edgehash_haskey(edge_hash, mf->v2, mf->v3)) { PRINT(" face %d: edge v2/v3 (%d,%d) is missing egde data\n", i, mf->v2, mf->v3); do_edge_recalc= TRUE; } + if(!BLI_edgehash_haskey(edge_hash, mf->v3, mf->v4)) { PRINT(" face %d: edge v3/v4 (%d,%d) is missing egde data\n", i, mf->v3, mf->v4); do_edge_recalc= TRUE; } + if(!BLI_edgehash_haskey(edge_hash, mf->v4, mf->v1)) { PRINT(" face %d: edge v4/v1 (%d,%d) is missing egde data\n", i, mf->v4, mf->v1); do_edge_recalc= TRUE; } + } + else { + if(!BLI_edgehash_haskey(edge_hash, mf->v1, mf->v2)) { PRINT(" face %d: edge v1/v2 (%d,%d) is missing egde data\n", i, mf->v1, mf->v2); do_edge_recalc= TRUE; } + if(!BLI_edgehash_haskey(edge_hash, mf->v2, mf->v3)) { PRINT(" face %d: edge v2/v3 (%d,%d) is missing egde data\n", i, mf->v2, mf->v3); do_edge_recalc= TRUE; } + if(!BLI_edgehash_haskey(edge_hash, mf->v3, mf->v1)) { PRINT(" face %d: edge v3/v1 (%d,%d) is missing egde data\n", i, mf->v3, mf->v1); do_edge_recalc= TRUE; } + } + } - if(totedge) { - if(!BLI_edgehash_haskey(edge_hash, mf->v1, mf->v2)) printf(" face %d: edge v1/v2 (%d,%d) is missing egde data\n", i, mf->v1, mf->v2); - if(!BLI_edgehash_haskey(edge_hash, mf->v2, mf->v3)) printf(" face %d: edge v2/v3 (%d,%d) is missing egde data\n", i, mf->v2, mf->v3); - if(!BLI_edgehash_haskey(edge_hash, mf->v3, mf->v1)) printf(" face %d: edge v3/v1 (%d,%d) is missing egde data\n", i, mf->v3, mf->v1); - } - /* TODO, avoid double lookop */ - /* - fedges[0]= GET_INT_FROM_POINTER(BLI_edgehash_lookup(edge_hash, mf->v1, mf->v2)); - fedges[1]= GET_INT_FROM_POINTER(BLI_edgehash_lookup(edge_hash, mf->v2, mf->v3)); - fedges[2]= GET_INT_FROM_POINTER(BLI_edgehash_lookup(edge_hash, mf->v3, mf->v1)); - */ - qsort(fverts, 3, sizeof(int), uint_cmp); - } + search_faces[totsearchface].index = i; - search_faces[i].index = i; + if(mf->v4) { + qsort(fverts, 4, sizeof(unsigned int), uint_cmp); + search_faces[i].v[0] = fverts[0]; + search_faces[i].v[1] = fverts[1]; + search_faces[i].v[2] = fverts[2]; + search_faces[i].v[3] = fverts[3]; + } + else { + qsort(fverts, 3, sizeof(unsigned int), uint_cmp); + search_faces[i].v[0] = fverts[0]; + search_faces[i].v[1] = fverts[1]; + search_faces[i].v[2] = fverts[2]; + search_faces[i].v[3] = UINT_MAX; + } - if(mf->v4) { - search_faces[i].v[0] = fverts[0]; - search_faces[i].v[1] = fverts[1]; - search_faces[i].v[2] = fverts[2]; - search_faces[i].v[3] = fverts[3]; + totsearchface++; + } } - else { - search_faces[i].v[0] = fverts[0]; - search_faces[i].v[1] = fverts[1]; - search_faces[i].v[2] = fverts[2]; - search_faces[i].v[3] = UINT_MAX; + if(remove) { + REMOVE_FACE_TAG(mf); } } - qsort(search_faces, totface, sizeof(SearchFace), search_face_cmp); + qsort(search_faces, totsearchface, sizeof(SearchFace), search_face_cmp); sf= search_faces; sf_prev= sf; sf++; - for(i=1; iv, sf_prev->v, sizeof(sf_prev->v)) == 0) { /* slow, could be smarter here */ MFace *mf= mfaces + sf->index; MFace *mf_prev= mfaces + sf_prev->index; - int size_expect, size_found; - - EdgeHash *eh_tmp= BLI_edgehash_new(); - if(mf->v4) { - BLI_edgehash_insert(eh_tmp, mf->v1, mf->v2, NULL); - BLI_edgehash_insert(eh_tmp, mf->v2, mf->v3, NULL); - BLI_edgehash_insert(eh_tmp, mf->v3, mf->v4, NULL); - BLI_edgehash_insert(eh_tmp, mf->v4, mf->v1, NULL); - BLI_edgehash_insert(eh_tmp, mf_prev->v1, mf_prev->v2, NULL); - BLI_edgehash_insert(eh_tmp, mf_prev->v2, mf_prev->v3, NULL); - BLI_edgehash_insert(eh_tmp, mf_prev->v3, mf_prev->v4, NULL); - BLI_edgehash_insert(eh_tmp, mf_prev->v4, mf_prev->v1, NULL); + EdgeStore es[4]; + EdgeStore es_prev[4]; - size_expect= 4; + if(mf->v4) { + edge_store_from_mface_quad(es, mf); + edge_store_from_mface_quad(es_prev, mf_prev); + + if( + ELEM4(es[0].edval, es_prev[0].edval, es_prev[1].edval, es_prev[2].edval, es_prev[3].edval) && + ELEM4(es[1].edval, es_prev[0].edval, es_prev[1].edval, es_prev[2].edval, es_prev[3].edval) && + ELEM4(es[2].edval, es_prev[0].edval, es_prev[1].edval, es_prev[2].edval, es_prev[3].edval) && + ELEM4(es[3].edval, es_prev[0].edval, es_prev[1].edval, es_prev[2].edval, es_prev[3].edval) + ) { + PRINT(" face %d & %d: are duplicates ", sf->index, sf_prev->index); + PRINT("(%d,%d,%d,%d) ", mf->v1, mf->v2, mf->v3, mf->v4); + PRINT("(%d,%d,%d,%d)\n", mf_prev->v1, mf_prev->v2, mf_prev->v3, mf_prev->v4); + remove= do_fixes; + } } else { - BLI_edgehash_insert(eh_tmp, mf->v1, mf->v2, NULL); - BLI_edgehash_insert(eh_tmp, mf->v2, mf->v3, NULL); - BLI_edgehash_insert(eh_tmp, mf->v3, mf->v1, NULL); - - BLI_edgehash_insert(eh_tmp, mf_prev->v1, mf_prev->v2, NULL); - BLI_edgehash_insert(eh_tmp, mf_prev->v2, mf_prev->v3, NULL); - BLI_edgehash_insert(eh_tmp, mf_prev->v3, mf_prev->v1, NULL); - - size_expect= 3; - } - - size_found= BLI_edgehash_size(eh_tmp); - BLI_edgehash_free(eh_tmp, NULL); - - if(size_found != size_expect) { - printf(" face %d & %d: are duplicates ", sf->index, sf_prev->index); - if(mf->v4) { - printf("(%d,%d,%d,%d) ", mf->v1, mf->v2, mf->v3, mf->v4); - printf("(%d,%d,%d,%d)\n", mf_prev->v1, mf_prev->v2, mf_prev->v3, mf_prev->v4); - } - else { - printf("(%d,%d,%d) ", mf->v1, mf->v2, mf->v3); - printf("(%d,%d,%d)\n", mf_prev->v1, mf_prev->v2, mf_prev->v3); + edge_store_from_mface_tri(es, mf); + edge_store_from_mface_tri(es_prev, mf); + if( + ELEM3(es[0].edval, es_prev[0].edval, es_prev[1].edval, es_prev[2].edval) && + ELEM3(es[1].edval, es_prev[0].edval, es_prev[1].edval, es_prev[2].edval) && + ELEM3(es[2].edval, es_prev[0].edval, es_prev[1].edval, es_prev[2].edval) + ) { + PRINT(" face %d & %d: are duplicates ", sf->index, sf_prev->index); + PRINT("(%d,%d,%d) ", mf->v1, mf->v2, mf->v3); + PRINT("(%d,%d,%d)\n", mf_prev->v1, mf_prev->v2, mf_prev->v3); + remove= do_fixes; } } } + + if(remove) { + REMOVE_FACE_TAG(mf); + /* keep sf_prev */ + } + else { + sf_prev= sf; + } } BLI_edgehash_free(edge_hash, NULL); MEM_freeN(search_faces); - printf("BKE_mesh_validate: finished\n\n"); + PRINT("BKE_mesh_validate: finished\n\n"); + +# undef PRINT +# undef REMOVE_EDGE_TAG +# undef REMOVE_FACE_TAG + + if(me) { + if(do_face_free) { + mesh_strip_loose_faces(me); + } + + if (do_edge_free) { + mesh_strip_loose_edges(me); + } + + if(do_fixes && do_edge_recalc) { + BKE_mesh_calc_edges(me, TRUE); + } + } } void BKE_mesh_validate(Mesh *me) { printf("MESH: %s\n", me->id.name+2); - BKE_mesh_validate_arrays(me->mvert, me->totvert, me->medge, me->totedge, me->mface, me->totface); + BKE_mesh_validate_arrays(me, me->mvert, me->totvert, me->medge, me->totedge, me->mface, me->totface, TRUE, TRUE); } void BKE_mesh_validate_dm(DerivedMesh *dm) { - BKE_mesh_validate_arrays(dm->getVertArray(dm), dm->getNumVerts(dm), dm->getEdgeArray(dm), dm->getNumEdges(dm), dm->getFaceArray(dm), dm->getNumFaces(dm)); + BKE_mesh_validate_arrays(NULL, dm->getVertArray(dm), dm->getNumVerts(dm), dm->getEdgeArray(dm), dm->getNumEdges(dm), dm->getFaceArray(dm), dm->getNumFaces(dm), TRUE, FALSE); +} + + +void BKE_mesh_calc_edges(Mesh *mesh, int update) +{ + CustomData edata; + EdgeHashIterator *ehi; + MFace *mf = mesh->mface; + MEdge *med, *med_orig; + EdgeHash *eh = BLI_edgehash_new(); + int i, totedge, totface = mesh->totface; + + if(mesh->totedge==0) + update= 0; + + if(update) { + /* assume existing edges are valid + * useful when adding more faces and generating edges from them */ + med= mesh->medge; + for(i= 0; itotedge; i++, med++) + BLI_edgehash_insert(eh, med->v1, med->v2, med); + } + + for (i = 0; i < totface; i++, mf++) { + if (!BLI_edgehash_haskey(eh, mf->v1, mf->v2)) + BLI_edgehash_insert(eh, mf->v1, mf->v2, NULL); + if (!BLI_edgehash_haskey(eh, mf->v2, mf->v3)) + BLI_edgehash_insert(eh, mf->v2, mf->v3, NULL); + + if (mf->v4) { + if (!BLI_edgehash_haskey(eh, mf->v3, mf->v4)) + BLI_edgehash_insert(eh, mf->v3, mf->v4, NULL); + if (!BLI_edgehash_haskey(eh, mf->v4, mf->v1)) + BLI_edgehash_insert(eh, mf->v4, mf->v1, NULL); + } else { + if (!BLI_edgehash_haskey(eh, mf->v3, mf->v1)) + BLI_edgehash_insert(eh, mf->v3, mf->v1, NULL); + } + } + + totedge = BLI_edgehash_size(eh); + + /* write new edges into a temporary CustomData */ + memset(&edata, 0, sizeof(edata)); + CustomData_add_layer(&edata, CD_MEDGE, CD_CALLOC, NULL, totedge); + + ehi = BLI_edgehashIterator_new(eh); + med = CustomData_get_layer(&edata, CD_MEDGE); + for(i = 0; !BLI_edgehashIterator_isDone(ehi); + BLI_edgehashIterator_step(ehi), ++i, ++med) { + + if(update && (med_orig=BLI_edgehashIterator_getValue(ehi))) { + *med= *med_orig; /* copy from the original */ + } else { + BLI_edgehashIterator_getKey(ehi, (int*)&med->v1, (int*)&med->v2); + med->flag = ME_EDGEDRAW|ME_EDGERENDER|SELECT; /* select for newly created meshes which are selected [#25595] */ + } + } + BLI_edgehashIterator_free(ehi); + + /* free old CustomData and assign new one */ + CustomData_free(&mesh->edata, mesh->totedge); + mesh->edata = edata; + mesh->totedge = totedge; + + mesh->medge = CustomData_get_layer(&mesh->edata, CD_MEDGE); + + BLI_edgehash_free(eh, NULL); } diff --git a/source/blender/editors/mesh/mesh_data.c b/source/blender/editors/mesh/mesh_data.c index 5f03edb38a2..cfd1b006ece 100644 --- a/source/blender/editors/mesh/mesh_data.c +++ b/source/blender/editors/mesh/mesh_data.c @@ -546,77 +546,10 @@ void MESH_OT_sticky_remove(wmOperatorType *ot) /************************** Add Geometry Layers *************************/ -static void mesh_calc_edges(Mesh *mesh, int update) -{ - CustomData edata; - EdgeHashIterator *ehi; - MFace *mf = mesh->mface; - MEdge *med, *med_orig; - EdgeHash *eh = BLI_edgehash_new(); - int i, totedge, totface = mesh->totface; - - if(mesh->totedge==0) - update= 0; - - if(update) { - /* assume existing edges are valid - * useful when adding more faces and generating edges from them */ - med= mesh->medge; - for(i= 0; itotedge; i++, med++) - BLI_edgehash_insert(eh, med->v1, med->v2, med); - } - - for (i = 0; i < totface; i++, mf++) { - if (!BLI_edgehash_haskey(eh, mf->v1, mf->v2)) - BLI_edgehash_insert(eh, mf->v1, mf->v2, NULL); - if (!BLI_edgehash_haskey(eh, mf->v2, mf->v3)) - BLI_edgehash_insert(eh, mf->v2, mf->v3, NULL); - - if (mf->v4) { - if (!BLI_edgehash_haskey(eh, mf->v3, mf->v4)) - BLI_edgehash_insert(eh, mf->v3, mf->v4, NULL); - if (!BLI_edgehash_haskey(eh, mf->v4, mf->v1)) - BLI_edgehash_insert(eh, mf->v4, mf->v1, NULL); - } else { - if (!BLI_edgehash_haskey(eh, mf->v3, mf->v1)) - BLI_edgehash_insert(eh, mf->v3, mf->v1, NULL); - } - } - - totedge = BLI_edgehash_size(eh); - - /* write new edges into a temporary CustomData */ - memset(&edata, 0, sizeof(edata)); - CustomData_add_layer(&edata, CD_MEDGE, CD_CALLOC, NULL, totedge); - - ehi = BLI_edgehashIterator_new(eh); - med = CustomData_get_layer(&edata, CD_MEDGE); - for(i = 0; !BLI_edgehashIterator_isDone(ehi); - BLI_edgehashIterator_step(ehi), ++i, ++med) { - - if(update && (med_orig=BLI_edgehashIterator_getValue(ehi))) { - *med= *med_orig; /* copy from the original */ - } else { - BLI_edgehashIterator_getKey(ehi, (int*)&med->v1, (int*)&med->v2); - med->flag = ME_EDGEDRAW|ME_EDGERENDER|SELECT; /* select for newly created meshes which are selected [#25595] */ - } - } - BLI_edgehashIterator_free(ehi); - - /* free old CustomData and assign new one */ - CustomData_free(&mesh->edata, mesh->totedge); - mesh->edata = edata; - mesh->totedge = totedge; - - mesh->medge = CustomData_get_layer(&mesh->edata, CD_MEDGE); - - BLI_edgehash_free(eh, NULL); -} - void ED_mesh_update(Mesh *mesh, bContext *C, int calc_edges) { if(calc_edges || (mesh->totface && mesh->totedge == 0)) - mesh_calc_edges(mesh, calc_edges); + BKE_mesh_calc_edges(mesh, calc_edges); mesh_calc_normals(mesh->mvert, mesh->totvert, mesh->mface, mesh->totface, NULL); diff --git a/source/blender/makesrna/intern/rna_mesh_api.c b/source/blender/makesrna/intern/rna_mesh_api.c index e8de1cfe5b4..dd78e93835e 100644 --- a/source/blender/makesrna/intern/rna_mesh_api.c +++ b/source/blender/makesrna/intern/rna_mesh_api.c @@ -58,10 +58,8 @@ void RNA_api_mesh(StructRNA *srna) RNA_def_boolean(func, "calc_edges", 0, "Calculate Edges", "Force recalculation of edges."); RNA_def_function_flag(func, FUNC_USE_CONTEXT); - /* func= RNA_def_function(srna, "validate", "BKE_mesh_validate"); RNA_def_function_ui_description(func, "validate geometry."); - */ } #endif -- cgit v1.2.3