diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-10-22 21:12:28 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-10-22 21:12:28 +0400 |
| commit | e2b74dc7364a11b5328954b6a49a46cd44dfbd2e (patch) | |
| tree | 34f7618f3c40f391afe28a2c88ee8a76a1c446bd /source/blender/editors/mesh/editmesh.c | |
| parent | 3ffb695b10bd85f7cd431f6144dbc2c427a365ee (diff) | |
Shape Keys
Active shape key can now be changed while in edit mode. This is based
on exit/enter editmode again in the background, which is not ideal,
as that loses the undo history. But that already happened anyway when
you did exit/change-active/enter manually.
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 408c793751b..8b9de0f6348 100644 --- a/source/blender/editors/mesh/editmesh.c +++ b/source/blender/editors/mesh/editmesh.c @@ -785,6 +785,7 @@ void make_editMesh(Scene *scene, Object *ob) /* undo-ing in past for previous editmode sessions gives corrupt 'keyindex' values */ undo_editmode_clear(); keyco= actkey->data; + em->shapenr= ob->shapenr; } /* make editverts */ @@ -1184,7 +1185,8 @@ void load_editMesh(Scene *scene, Object *ob) /* are there keys? */ if(me->key) { - KeyBlock *currkey, *actkey = ob_get_keyblock(ob); + KeyBlock *currkey; + KeyBlock *actkey= BLI_findlink(&me->key->block, em->shapenr-1); /* Lets reorder the key data so that things line up roughly * with the way things were before editmode */ |