diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2005-04-23 05:36:08 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2005-04-23 05:36:08 +0400 |
| commit | c333ba8dfaa8e92483d29f3cf77988ce0e1beb3a (patch) | |
| tree | b2a7ea6a784d0376f2c9fc4e77b5fbddd7f9e373 /source/blender/src/space.c | |
| parent | 375cf60462cadb8625b13f9b256f69df15831336 (diff) | |
Merging over some uv editor tweaks from tuhopuu:
- Moved Weld/Align out of transform code, now it's a menu.
- Removed confirmation popups for LSCM unwrapping in the uv editor, didn't
make sense anymore now we have undo.
- Extended select linked, to work more like it does in edit mode:
- L: select linked uvs/faces under the mouse
- Shift+L: select/deselect linked uvs/faces under the mouse
(like shift+click for selecting single uvs/faces)
- Ctrl+L: how L worked before
- More accurate uv selection: when selecting one uv from a group of uvs that
are in the same position, it now selects the uv belonging to the face the
mouse is over, instead of a random uv.
- 'View Selected' (numpad .-key) for both faceselect mode and the uv editor.
Diffstat (limited to 'source/blender/src/space.c')
| -rw-r--r-- | source/blender/src/space.c | 37 |
1 files changed, 24 insertions, 13 deletions
diff --git a/source/blender/src/space.c b/source/blender/src/space.c index 28fd15279ea..bde20a6048e 100644 --- a/source/blender/src/space.c +++ b/source/blender/src/space.c @@ -1356,14 +1356,22 @@ static void winqreadview3dspace(ScrArea *sa, void *spacedata, BWinEvent *evt) selectconnected_posearmature(); } else { - if((G.qual==LR_SHIFTKEY)) - selectlinks_menu(); - else if(G.qual==LR_CTRLKEY) - make_links_menu(); - else if(G.f & G_FACESELECT) - select_linked_tfaces(); - else if((G.qual==0)) - make_local(); + if(G.f & G_FACESELECT) { + if((G.qual==0)) + select_linked_tfaces(0); + else if((G.qual==LR_SHIFTKEY)) + select_linked_tfaces(1); + else if(G.qual==LR_CTRLKEY) + select_linked_tfaces(2); + } + else { + if((G.qual==0)) + make_local(); + else if((G.qual==LR_SHIFTKEY)) + selectlinks_menu(); + else if(G.qual==LR_CTRLKEY) + make_links_menu(); + } } break; case MKEY: @@ -3771,8 +3779,7 @@ static void winqreadimagespace(ScrArea *sa, void *spacedata, BWinEvent *evt) toggle_uv_select('f'); break; case EKEY : - if (okee("LSCM unwrap")) - unwrap_lscm(); + unwrap_lscm(); break; case GKEY: if((G.qual==0)) @@ -3787,8 +3794,12 @@ static void winqreadimagespace(ScrArea *sa, void *spacedata, BWinEvent *evt) hide_tface_uv(0); break; case LKEY: - if((G.qual==0)) - select_linked_tface_uv(); + if(G.qual==0) + select_linked_tface_uv(0); + else if(G.qual==LR_SHIFTKEY) + select_linked_tface_uv(1); + else if(G.qual==LR_CTRLKEY) + select_linked_tface_uv(2); else if(G.qual==LR_ALTKEY) unlink_selection(); break; @@ -3833,7 +3844,7 @@ static void winqreadimagespace(ScrArea *sa, void *spacedata, BWinEvent *evt) stitch_uv_tface(1); break; case WKEY: - transform_tface_uv('w'); + weld_align_menu_tface_uv(); break; case PADPERIOD: if(G.qual==0) |