diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-03-11 23:58:56 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-03-11 23:58:56 +0400 |
| commit | b330abc290622b32419ba084b8bc7e6a8ea9aaa2 (patch) | |
| tree | 62c0590af336f1028fd05ffd33c28b7dec0f0c3c /source/blender/editors/transform/transform.c | |
| parent | 42b3463030b07ba3a87574c173e759e3bb15353b (diff) | |
remove Object member from BMesh struct - was only used for undo and BMEditMesh already stores an object pointer.
also fix for own mistake with mesh conversion refactor, shape key index was off by 1 when switching editmode.
Diffstat (limited to 'source/blender/editors/transform/transform.c')
| -rw-r--r-- | source/blender/editors/transform/transform.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c index 666d0a2f7f2..7b98a2f0083 100644 --- a/source/blender/editors/transform/transform.c +++ b/source/blender/editors/transform/transform.c @@ -4552,7 +4552,7 @@ static int createSlideVerts(TransInfo *t) float vec1[3], dis2, mval[2] = {t->mval[0], t->mval[1]}, d; /* search cross edges for visible edge to the mouse cursor, - * then use the shared vertex to calculate screen vector*/ + * then use the shared vertex to calculate screen vector*/ dis2 = -1.0f; for (i=0; i<2; i++) { v = i?e->v1:e->v2; @@ -4590,8 +4590,7 @@ static int createSlideVerts(TransInfo *t) } } } - - em->bm->ob = t->obedit; + bmesh_edit_begin(em->bm, BMO_OP_FLAG_UNTAN_MULTIRES); /*create copies of faces for customdata projection*/ @@ -4779,7 +4778,6 @@ void freeSlideVerts(TransInfo *t) freeSlideTempFaces(sld); - sld->em->bm->ob = t->obedit; bmesh_edit_end(sld->em->bm, BMO_OP_FLAG_UNTAN_MULTIRES); BLI_smallhash_release(&sld->vhash); |