kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

fix for bmesh regression similar to last revision r54920. only effected loading old blend files without edge data.

Browse Source
This commit is contained in:
Campbell Barton 2013-02-28 04:18:01 +00:00
parent d17c13d145
commit 1810913f81
2 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
source/blender/blenkernel/intern/mesh.c
View File

@ -887,12 +887,11 @@ static void make_edges_mdata(MVert *UNUSED(allvert), MFace *allface, MLoop *alll
int old, MEdge **alledge, int *_totedge)
{
MPoly *mpoly;
MLoop *mloop;
MFace *mface;
MEdge *medge;
EdgeHash *hash = BLI_edgehash_new();
struct edgesort *edsort, *ed;
int a, b, totedge = 0, final = 0;
int a, totedge = 0, final = 0;
/* we put all edges in array, sort them, and detect doubles that way */
@ -973,13 +972,16 @@ static void make_edges_mdata(MVert *UNUSED(allvert), MFace *allface, MLoop *alll
mpoly = allpoly;
for (a = 0; a < totpoly; a++, mpoly++) {
mloop = allloop + mpoly->loopstart;
for (b = 0; b < mpoly->totloop; b++) {
int v1, v2;
MLoop *ml, *ml_next;
int i = mpoly->totloop;
v1 = mloop[b].v;
v2 = ME_POLY_LOOP_NEXT(mloop, mpoly, b)->v;
mloop[b].e = GET_INT_FROM_POINTER(BLI_edgehash_lookup(hash, v1, v2));
ml_next = allloop + mpoly->loopstart; /* first loop */
ml = &ml_next[i - 1]; /* last loop */
while (i-- != 0) {
ml->e = GET_INT_FROM_POINTER(BLI_edgehash_lookup(hash, ml->v, ml_next->v));
ml = ml_next;
ml_next++;
}
}

7
source/blender/editors/mesh/editface.c
View File

@ -181,12 +181,11 @@ void paintface_reveal(Object *ob)
static void hash_add_face(EdgeHash *ehash, MPoly *mp, MLoop *mloop)
{
MLoop *ml;
MLoop *ml_next;
MLoop *ml, *ml_next;
int i = mp->totloop;
ml_next = mloop;
ml = &mloop[mp->totloop - 1];
ml_next = mloop; /* first loop */
ml = &ml_next[i - 1]; /* last loop */
while (i-- != 0) {
BLI_edgehash_insert(ehash, ml->v, ml_next->v, NULL);