diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2008-03-12 22:55:37 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2008-03-12 22:55:37 +0300 |
commit | d73ed401da72d022179e968652730537c6d0acf6 (patch) | |
tree | 27642092ae4d96e18e25d962ba106691f7cf71c8 /source/blender/src/header_image.c | |
parent | de718de31665d154069f816afc490526c0485968 (diff) |
Added two UV features (Apricot request):
- Alt+click edge loop select.
- Next to Align X/Y, Align Auto which will pick X or Y automatically,
should give the expected result for nearly all cases.
Diffstat (limited to 'source/blender/src/header_image.c')
-rw-r--r-- | source/blender/src/header_image.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/source/blender/src/header_image.c b/source/blender/src/header_image.c index 51fd0fab718..b5abf0947e4 100644 --- a/source/blender/src/header_image.c +++ b/source/blender/src/header_image.c @@ -934,16 +934,19 @@ static void do_image_uvs_weldalignmenu(void *arg, int event) case 0: /* Weld */ weld_align_tface_uv('w'); break; - case 1: /* Align X */ + case 1: /* Align Auto */ + weld_align_tface_uv('a'); + break; + case 2: /* Align X */ weld_align_tface_uv('x'); break; - case 2: /* Align Y */ + case 3: /* Align Y */ weld_align_tface_uv('y'); break; } if(event==0) BIF_undo_push("Weld UV"); - else if(event==1 || event==2) BIF_undo_push("Align UV"); + else if(ELEM3(event, 1, 2, 3)) BIF_undo_push("Align UV"); } static uiBlock *image_uvs_weldalignmenu(void *arg_unused) @@ -955,8 +958,9 @@ static uiBlock *image_uvs_weldalignmenu(void *arg_unused) uiBlockSetButmFunc(block, do_image_uvs_weldalignmenu, NULL); uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Weld|W, 1", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 0, ""); - uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Align X|W, 2", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 1, ""); - uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Align Y|W, 3", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 2, ""); + uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Align Auto|W, 2", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 1, ""); + uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Align X|W, 3", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 2, ""); + uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Align Y|W, 4", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 3, ""); uiBlockSetDirection(block, UI_RIGHT); uiTextBoundsBlock(block, 60); |