diff options
| -rw-r--r-- | source/blender/src/editaction.c | 16 | ||||
| -rw-r--r-- | source/blender/src/header_action.c | 13 |
2 files changed, 15 insertions, 14 deletions
diff --git a/source/blender/src/editaction.c b/source/blender/src/editaction.c index 9d3b6367732..ec4e3e71a3f 100644 --- a/source/blender/src/editaction.c +++ b/source/blender/src/editaction.c @@ -1764,13 +1764,14 @@ static void mouse_actionchannels_protect (bAction *act, short *mval) void delete_meshchannel_keys(Key *key) { - if (!okee("Erase selected keys")) - return; - - BIF_undo_push("Delete Action keys"); delete_ipo_keys(key->ipo); - + + BIF_undo_push("Delete Action Keys"); meshkey_do_redraw(key); + allspace(REMAKEIPO, 0); + allqueue(REDRAWACTION, 0); + allqueue(REDRAWIPO, 0); + allqueue(REDRAWNLA, 0); } void delete_actionchannel_keys(void) @@ -1783,9 +1784,6 @@ void delete_actionchannel_keys(void) if (!act) return; - if (!okee("Erase selected keys")) - return; - for (achan = act->chanbase.first; achan; achan= achan->next){ if(EDITABLE_ACHAN(achan)) { /* Check action channel keys*/ @@ -1802,7 +1800,7 @@ void delete_actionchannel_keys(void) } remake_action_ipos(act); - BIF_undo_push("Delete Action keys"); + BIF_undo_push("Delete Action Keys"); allspace(REMAKEIPO, 0); allqueue(REDRAWACTION, 0); allqueue(REDRAWIPO, 0); diff --git a/source/blender/src/header_action.c b/source/blender/src/header_action.c index 76244ff2e6a..97c328f0b4f 100644 --- a/source/blender/src/header_action.c +++ b/source/blender/src/header_action.c @@ -59,6 +59,7 @@ #include "BIF_resources.h" #include "BIF_screen.h" #include "BIF_space.h" +#include "BIF_toolbox.h" #include "BKE_action.h" #include "BKE_armature.h" @@ -999,11 +1000,13 @@ static void do_action_keymenu(void *arg, int event) break; case ACTMENU_KEY_DELETE: - if (key) { - delete_meshchannel_keys(key); - } - else if (act) { - delete_actionchannel_keys (); + if (okee("Erase selected keys")) { + if (key) { + delete_meshchannel_keys(key); + } + else if (act) { + delete_actionchannel_keys (); + } } break; case ACTMENU_KEY_BAKE: |