archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Removed double confirmation for deleting keys in action editor.

Browse Source
This commit is contained in:
Joshua Leung
2006-12-17 03:03:05 +00:00
parent 1041ad4719
commit e6434898c8
2 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
source/blender/src/editaction.c
View File

@@ -1764,13 +1764,14 @@ static void mouse_actionchannels_protect (bAction *act, short *mval)
void delete_meshchannel_keys(Key *key) void delete_meshchannel_keys(Key *key)
{ {
if (!okee("Erase selected keys"))
return;
BIF_undo_push("Delete Action keys");
delete_ipo_keys(key->ipo); delete_ipo_keys(key->ipo);
BIF_undo_push("Delete Action Keys");
meshkey_do_redraw(key); meshkey_do_redraw(key);
allspace(REMAKEIPO, 0);
allqueue(REDRAWACTION, 0);
allqueue(REDRAWIPO, 0);
allqueue(REDRAWNLA, 0);
} }
void delete_actionchannel_keys(void) void delete_actionchannel_keys(void)
@@ -1783,9 +1784,6 @@ void delete_actionchannel_keys(void)
if (!act) if (!act)
return; return;
if (!okee("Erase selected keys"))
return;
for (achan = act->chanbase.first; achan; achan= achan->next){ for (achan = act->chanbase.first; achan; achan= achan->next){
if(EDITABLE_ACHAN(achan)) { if(EDITABLE_ACHAN(achan)) {
/* Check action channel keys*/ /* Check action channel keys*/
@@ -1802,7 +1800,7 @@ void delete_actionchannel_keys(void)
} }
remake_action_ipos(act); remake_action_ipos(act);
BIF_undo_push("Delete Action keys"); BIF_undo_push("Delete Action Keys");
allspace(REMAKEIPO, 0); allspace(REMAKEIPO, 0);
allqueue(REDRAWACTION, 0); allqueue(REDRAWACTION, 0);
allqueue(REDRAWIPO, 0); allqueue(REDRAWIPO, 0);

13
source/blender/src/header_action.c
View File

@@ -59,6 +59,7 @@
#include "BIF_resources.h" #include "BIF_resources.h"
#include "BIF_screen.h" #include "BIF_screen.h"
#include "BIF_space.h" #include "BIF_space.h"
#include "BIF_toolbox.h"
#include "BKE_action.h" #include "BKE_action.h"
#include "BKE_armature.h" #include "BKE_armature.h"
@@ -999,11 +1000,13 @@ static void do_action_keymenu(void *arg, int event)
break; break;
case ACTMENU_KEY_DELETE: case ACTMENU_KEY_DELETE:
if (key) { if (okee("Erase selected keys")) {
delete_meshchannel_keys(key); if (key) {
} delete_meshchannel_keys(key);
else if (act) { }
delete_actionchannel_keys (); else if (act) {
delete_actionchannel_keys ();
}
} }
break; break;
case ACTMENU_KEY_BAKE: case ACTMENU_KEY_BAKE: