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

When pressing XKEY or DELETE in NLA/Action/IPO editors, you are no

Browse Source 
longer asked whether you want to delete the selected markers or keys.
Instead, it more 'logically' deletes anything that is selected.
This commit is contained in:
Joshua Leung
2007-03-17 05:50:47 +00:00
parent b00f592992
commit bd04d23465
4 changed files with 29 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3056,31 +3056,23 @@ void winqreadactionspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
break;
case DELKEY:
case XKEY:
nr= pupmenu("Erase selected%t|Keys %x1|Markers %x2");
switch (nr) {
case 1:
{
if (key) {
delete_meshchannel_keys(key);
}
else {
if (mval[0]<NAMEWIDTH)
delete_actionchannels();
else
delete_actionchannel_keys();
}
if (okee("Erase selected")) {
if (key) {
delete_meshchannel_keys(key);
}
break;
case 2:
{
remove_marker();
allqueue(REDRAWTIME, 0);
allqueue(REDRAWIPO, 0);
allqueue(REDRAWACTION, 0);
allqueue(REDRAWNLA, 0);
allqueue(REDRAWSOUND, 0);
else {
if (mval[0]<NAMEWIDTH)
delete_actionchannels();
else
delete_actionchannel_keys();
}
remove_marker();
allqueue(REDRAWTIME, 0);
allqueue(REDRAWIPO, 0);
allqueue(REDRAWACTION, 0);
allqueue(REDRAWNLA, 0);
allqueue(REDRAWSOUND, 0);
}
break;
/* LEFTMOUSE and RIGHTMOUSE event codes can be swapped above,
@@ -3101,7 +3093,8 @@ void winqreadactionspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
if( cfra!=CFRA ) {
CFRA= cfra;
update_for_newframe();
force_draw_all(0); }
force_draw_all(0);
}
else PIL_sleep_ms(30);
} while(get_mbut() & mousebut);

10
source/blender/src/editnla.c
View File

@@ -1937,20 +1937,18 @@ void winqreadnlaspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
case DELKEY:
case XKEY:
if (mval[0]>=NLAWIDTH) {
val= pupmenu("Erase selected%t|Strips and/or Keys%x1|Markers%x2");
if (val==1) {
if (okee("Erase selected?")) {
remove_marker();
delete_nlachannel_keys();
update_for_newframe_muted();
}
else if (val==2) {
remove_marker();
allqueue(REDRAWTIME, 0);
allqueue(REDRAWIPO, 0);
allqueue(REDRAWACTION, 0);
allqueue(REDRAWNLA, 0);
allqueue(REDRAWSOUND, 0);
}
}
}
break;

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

@@ -1004,13 +1004,11 @@ static void do_action_keymenu(void *arg, int event)
break;
case ACTMENU_KEY_DELETE:
if (okee("Erase selected keys")) {
if (key) {
delete_meshchannel_keys(key);
}
else if (act) {
delete_actionchannel_keys ();
}
if (key) {
delete_meshchannel_keys(key);
}
else if (act) {
delete_actionchannel_keys ();
}
break;
case ACTMENU_KEY_BAKE:

10
source/blender/src/space.c
View File

@@ -2728,15 +2728,11 @@ static void winqreadipospace(ScrArea *sa, void *spacedata, BWinEvent *evt)
break;
case XKEY:
case DELKEY:
val= pupmenu("Erase selected%t|Keys %x1|Markers %x2");
if (val == 1)
del_ipo(0);
else if (val == 2) {
if (okee("Erase selected")) {
remove_marker();
del_ipo(0);
allqueue(REDRAWTIME, 0);
allqueue(REDRAWIPO, 0);
allqueue(REDRAWACTION, 0);
allqueue(REDRAWNLA, 0);
allqueue(REDRAWSOUND, 0);
}
break;