diff options
| author | Jean-Luc Peurière <jlp@nerim.net> | 2008-03-21 20:00:40 +0300 |
|---|---|---|
| committer | Jean-Luc Peurière <jlp@nerim.net> | 2008-03-21 20:00:40 +0300 |
| commit | 32b5138e6459df5298ca50865dafab4d22a4aeed (patch) | |
| tree | 8ba947a61d91fe051e9c3a864f5e0ca61968bca1 /source/blender/src/header_view3d.c | |
| parent | 473ba6ac718bc32b4fc6c6aee4d03673cf62936c (diff) | |
| parent | df1ba7da75f9b82f81693d5e0adfec29b2f4a424 (diff) | |
update to trunk r14199ndof
Diffstat (limited to 'source/blender/src/header_view3d.c')
| -rw-r--r-- | source/blender/src/header_view3d.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/source/blender/src/header_view3d.c b/source/blender/src/header_view3d.c index b8d13b493bb..5ec730bd097 100644 --- a/source/blender/src/header_view3d.c +++ b/source/blender/src/header_view3d.c @@ -934,7 +934,7 @@ static uiBlock *view3d_select_objectmenu(void *arg_unused) uiDefBut(block, SEPR, 0, "", 0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, ""); uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Select/Deselect All|A", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 1, ""); - uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Inverse", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 2, ""); + uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Inverse|Ctrl I", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 2, ""); uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Random", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 3, ""); uiDefIconTextBlockBut(block, view3d_select_object_layermenu, NULL, ICON_RIGHTARROW_THIN, "Select All by Layer", 0, yco-=20, 120, 19, ""); @@ -1787,8 +1787,7 @@ static void do_view3d_transformmenu(void *arg, int event) G.scene->snap_target = SCE_SNAP_TARGET_ACTIVE; break; case 21: - initTransform(TFM_ALIGN, CTX_NO_PET|CTX_AUTOCONFIRM); - Transform(); + alignmenu(); break; } allqueue(REDRAWVIEW3D, 0); @@ -1977,7 +1976,7 @@ static uiBlock *view3d_edit_object_transformmenu(void *arg_unused) block= uiNewBlock(&curarea->uiblocks, "view3d_edit_object_transformmenu", UI_EMBOSSP, UI_HELV, G.curscreen->mainwin); uiBlockSetButmFunc(block, do_view3d_edit_object_transformmenu, NULL); - uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Apply Scale/Rotationr to ObData|Ctrl A, 1", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 6, ""); + uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Apply Scale/Rotation to ObData|Ctrl A, 1", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 6, ""); uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Apply Visual Transform|Ctrl A, 2", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 7, ""); uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Apply Deformation|Ctrl Shift A", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 4, ""); uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Make Duplicates Real|Ctrl Shift A", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 5, ""); @@ -5638,7 +5637,7 @@ void view3d_buttons(void) xco+= XIC; } - str_menu = BIF_menustringTransformOrientation(); + str_menu = BIF_menustringTransformOrientation("Orientation"); uiDefButS(block, MENU, B_MAN_MODE, str_menu,xco,0,70,YIC, &G.vd->twmode, 0, 0, 0, 0, "Transform Orientation (ALT+Space)"); MEM_freeN(str_menu); |