diff options
| author | Joshua Leung <aligorith@gmail.com> | 2007-05-04 15:35:37 +0400 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2007-05-04 15:35:37 +0400 |
| commit | 2e8f8bff227cba464092007122145759a171c301 (patch) | |
| tree | 6f8449baddc3964ab3bc27101a5423a360781371 /source | |
| parent | d0d758176bf7792fe231720fd6b869bbd7934bf8 (diff) | |
Curves in Editmode:
HKEY and Shift HKEY are used to change the handle type of curve control points in the IPO and Action Editors, and also for curves in the 3d view until recently.
This commit reverses the hotkey changes in:
http://projects.blender.org/pipermail/bf-blender-cvs/2007-May/009879.html
For curves, I've changed the show/hide points hotkeys to:
* Ctrl Alt HKEY == Hide Point(s)
* Alt HKEY == Show All Points
These aren't optimal, but at least there are usable hotkeys for this for now. Before, there had been a long-standing hotkey conflict. Better hotkeys can be designed as part of 2.5 work.
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/src/header_view3d.c | 4 | ||||
| -rw-r--r-- | source/blender/src/space.c | 8 | ||||
| -rw-r--r-- | source/blender/src/toolbox.c | 2 |
3 files changed, 8 insertions, 6 deletions
diff --git a/source/blender/src/header_view3d.c b/source/blender/src/header_view3d.c index 06a86a3f8ea..9afd7927833 100644 --- a/source/blender/src/header_view3d.c +++ b/source/blender/src/header_view3d.c @@ -3077,8 +3077,8 @@ static uiBlock *view3d_edit_curve_showhidemenu(void *arg_unused) uiBlockSetButmFunc(block, do_view3d_edit_curve_showhidemenu, NULL); uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Show Hidden|Alt H", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 10, ""); - uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Hide Selected|H", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 11, ""); - if (OBACT->type == OB_SURF) uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Hide Deselected Control Points|Shift H", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 12, ""); + uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Hide Selected|Alt Ctrl H", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 11, ""); + if (OBACT->type == OB_SURF) uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Hide Deselected Control Points|Alt Shift H", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 12, ""); uiBlockSetDirection(block, UI_RIGHT); diff --git a/source/blender/src/space.c b/source/blender/src/space.c index fc4a492d50c..75d2bc8f2e2 100644 --- a/source/blender/src/space.c +++ b/source/blender/src/space.c @@ -1884,12 +1884,14 @@ static void winqreadview3dspace(ScrArea *sa, void *spacedata, BWinEvent *evt) add_hook(); else if(G.qual==LR_ALTKEY) revealNurb(); - else if((G.qual==LR_SHIFTKEY)) + /* should be G.qual==LR_SHIFTKEY, but that is taken fro handles already */ + else if((G.qual==(LR_ALTKEY|LR_SHIFTKEY))) hideNurb(1); - else if((G.qual==0)) + /* should be G.qual==0, but that is taken for handles already */ + else if((G.qual==(LR_ALTKEY|LR_CTRLKEY))) hideNurb(0); else { - if(G.qual==LR_CTRLKEY) + if(G.qual==LR_CTRLKEY) /* conflict */ autocalchandlesNurb_all(1); /* flag=1, selected */ else if((G.qual==LR_SHIFTKEY)) sethandlesNurb(1); diff --git a/source/blender/src/toolbox.c b/source/blender/src/toolbox.c index 4a3dde25c67..be3614cd6b5 100644 --- a/source/blender/src/toolbox.c +++ b/source/blender/src/toolbox.c @@ -1129,7 +1129,7 @@ static TBitem tb_mesh[]= { static TBitem tb_curve_hide[]= { { 0, "Show Hidden|Alt H", 10, NULL}, -{ 0, "Hide Selected|H", 11, NULL}, +{ 0, "Hide Selected|Ctrl H", 11, NULL}, { -1, "", 0, do_view3d_edit_curve_showhidemenu}}; |