diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2006-11-13 18:36:33 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2006-11-13 18:36:33 +0300 |
commit | a43ba01c84236b7366b55f7059322dfe9e2597c9 (patch) | |
tree | d74c3faef216fc199a9a5f4944e97978e90d886f /source/blender/blenkernel | |
parent | d43ca75b8ad82d7f743a9ccbfef2f2799fea13a5 (diff) |
Fix for bug #5220: crash on edgeloop delete.
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r-- | source/blender/blenkernel/intern/cdderivedmesh.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/blenkernel/intern/cdderivedmesh.c b/source/blender/blenkernel/intern/cdderivedmesh.c index 9dc89760195..faa20180290 100644 --- a/source/blender/blenkernel/intern/cdderivedmesh.c +++ b/source/blender/blenkernel/intern/cdderivedmesh.c @@ -755,7 +755,7 @@ DerivedMesh *CDDM_from_editmesh(EditMesh *em, Mesh *me) /* set eve->hash to vert index */ for(i = 0, eve = em->verts.first; eve; eve = eve->next, ++i) - eve->hash = i; + eve->tmp.l = i; /* check for availability of layers */ if(CustomData_has_layer(&em->vdata, LAYERTYPE_MSTICKY)) @@ -807,8 +807,8 @@ DerivedMesh *CDDM_from_editmesh(EditMesh *em, Mesh *me) i++, eed = eed->next, index++) { MEdge *med = &medge[i]; - med->v1 = eed->v1->hash; - med->v2 = eed->v2->hash; + med->v1 = eed->v1->tmp.l; + med->v2 = eed->v2->tmp.l; med->crease = (unsigned char) (eed->crease * 255.0f); med->flag = ME_EDGEDRAW|ME_EDGERENDER; @@ -824,10 +824,10 @@ DerivedMesh *CDDM_from_editmesh(EditMesh *em, Mesh *me) i++, efa = efa->next, index++) { MFace *mf = &mface[i]; - mf->v1 = efa->v1->hash; - mf->v2 = efa->v2->hash; - mf->v3 = efa->v3->hash; - mf->v4 = efa->v4 ? efa->v4->hash : 0; + mf->v1 = efa->v1->tmp.l; + mf->v2 = efa->v2->tmp.l; + mf->v3 = efa->v3->tmp.l; + mf->v4 = efa->v4 ? efa->v4->tmp.l : 0; mf->mat_nr = efa->mat_nr; mf->flag = efa->flag; test_index_face(mf, NULL, NULL, efa->v4?4:3); |