diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-01-26 20:39:45 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-01-26 20:39:45 +0300 |
| commit | 722f57ca75a7c4fb77e07d9ee43d5ea79c02c04b (patch) | |
| tree | fb6f14d704aac06d199fa5c9cb7bdc9db319ddcc /source/blender/editors/mesh/editmesh.c | |
| parent | d5ca2369483dc429b858d4b79c49d002d360986a (diff) | |
Fix Blend From Shape having no effect after exiting edit mode.
Also added a UI string for mesh selection mode property to show
up in undo stack.
Diffstat (limited to 'source/blender/editors/mesh/editmesh.c')
| -rw-r--r-- | source/blender/editors/mesh/editmesh.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/editors/mesh/editmesh.c b/source/blender/editors/mesh/editmesh.c index 56e8ce79f24..d5794bfd4b3 100644 --- a/source/blender/editors/mesh/editmesh.c +++ b/source/blender/editors/mesh/editmesh.c @@ -1558,7 +1558,7 @@ typedef struct UndoMesh { EditFaceC *faces; EditSelectionC *selected; int totvert, totedge, totface, totsel; - short selectmode; + int selectmode, shapenr; RetopoPaintData *retopo_paint_data; char retopo_mode; CustomData vdata, edata, fdata; @@ -1598,6 +1598,7 @@ static void *editMesh_to_undoMesh(void *emv) um= MEM_callocN(sizeof(UndoMesh), "undomesh"); um->selectmode = em->selectmode; + um->shapenr = em->shapenr; for(eve=em->verts.first; eve; eve= eve->next) um->totvert++; for(eed=em->edges.first; eed; eed= eed->next) um->totedge++; @@ -1700,6 +1701,7 @@ static void undoMesh_to_editMesh(void *umv, void *emv) memset(em, 0, sizeof(EditMesh)); em->selectmode = um->selectmode; + em->shapenr = um->shapenr; init_editmesh_fastmalloc(em, um->totvert, um->totedge, um->totface); |