diff options
-rw-r--r-- | source/blender/src/header_view3d.c | 24 | ||||
-rw-r--r-- | source/blender/src/toolbox.c | 24 |
2 files changed, 24 insertions, 24 deletions
diff --git a/source/blender/src/header_view3d.c b/source/blender/src/header_view3d.c index fb1fa9e3cc8..7f4a86c17d4 100644 --- a/source/blender/src/header_view3d.c +++ b/source/blender/src/header_view3d.c @@ -154,9 +154,9 @@ static uiBlock *view3d_object_mirrormenu(void *arg_unused) block= uiNewBlock(&curarea->uiblocks, "view3d_object_mirrormenu", UI_EMBOSSP, UI_HELV, G.curscreen->mainwin); uiBlockSetButmFunc(block, do_view3d_object_mirrormenu, NULL); - uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "X Local|M, 1", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 1, ""); - uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Y Local|M, 2", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 2, ""); - uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Z Local|M, 3", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 3, ""); + uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "X Local|Ctrl M, 1", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 1, ""); + uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Y Local|Ctrl M, 2", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 2, ""); + uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Z Local|Ctrl M, 3", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 3, ""); uiBlockSetDirection(block, UI_RIGHT); uiTextBoundsBlock(block, 60); @@ -1857,21 +1857,21 @@ static uiBlock *view3d_edit_mirrormenu(void *arg_unused) block= uiNewBlock(&curarea->uiblocks, "view3d_edit_mirrormenu", UI_EMBOSSP, UI_HELV, G.curscreen->mainwin); uiBlockSetButmFunc(block, do_view3d_edit_mirrormenu, NULL); - uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "X Global|M, 1", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 1, ""); - uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Y Global|M, 2", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 2, ""); - uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Z Global|M, 3", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 3, ""); + uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "X Global|Ctrl M, 1", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 1, ""); + uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Y Global|Ctrl M, 2", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 2, ""); + uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Z Global|Ctrl M, 3", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 3, ""); uiDefBut(block, SEPR, 0, "", 0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, ""); - uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "X Local|M, 4", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 4, ""); - uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Y Local|M, 5", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 5, ""); - uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Z Local|M, 6", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 6, ""); + uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "X Local|Ctrl M, 4", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 4, ""); + uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Y Local|Ctrl M, 5", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 5, ""); + uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Z Local|Ctrl M, 6", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 6, ""); uiDefBut(block, SEPR, 0, "", 0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, ""); - uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "X View|M, 7", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 7, ""); - uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Y View|M, 8", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 8, ""); - uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Z View|M, 9", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 9, ""); + uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "X View|Ctrl M, 7", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 7, ""); + uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Y View|Ctrl M, 8", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 8, ""); + uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Z View|Ctrl M, 9", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 9, ""); uiBlockSetDirection(block, UI_RIGHT); uiTextBoundsBlock(block, 60); diff --git a/source/blender/src/toolbox.c b/source/blender/src/toolbox.c index 921319da9ba..42a2532e082 100644 --- a/source/blender/src/toolbox.c +++ b/source/blender/src/toolbox.c @@ -2049,9 +2049,9 @@ static void tb_do_transform(void *arg, int event) } static TBitem tb_transform_object_mirror[]= { -{ 0, "X Local|M, 1", 1, NULL}, -{ 0, "Y Local|M, 2", 2, NULL}, -{ 0, "Z Local|M, 3", 3, NULL}, +{ 0, "X Local|Ctrl M, 1", 1, NULL}, +{ 0, "Y Local|Ctrl M, 2", 2, NULL}, +{ 0, "Z Local|Ctrl M, 3", 3, NULL}, { -1, "", 0, do_view3d_object_mirrormenu}}; static TBitem tb_transform[]= { @@ -2071,17 +2071,17 @@ static TBitem tb_transform[]= { { -1, "", 0, tb_do_transform}}; static TBitem tb_transform_edit_mirror[]= { -{ 0, "X Global|M, 1", 1, NULL}, -{ 0, "Y Global|M, 2", 2, NULL}, -{ 0, "Z Global|M, 3", 3, NULL}, +{ 0, "X Global|Ctrl M, 1", 1, NULL}, +{ 0, "Y Global|Ctrl M, 2", 2, NULL}, +{ 0, "Z Global|Ctrl M, 3", 3, NULL}, { 0, "SEPR", 0, NULL}, -{ 0, "X Local|M, 4", 4, NULL}, -{ 0, "Y Local|M, 5", 5, NULL}, -{ 0, "Z Local|M, 6", 6, NULL}, +{ 0, "X Local|Ctrl M, 4", 4, NULL}, +{ 0, "Y Local|Ctrl M, 5", 5, NULL}, +{ 0, "Z Local|Ctrl M, 6", 6, NULL}, { 0, "SEPR", 0, NULL}, -{ 0, "X View|M, 7", 7, NULL}, -{ 0, "Y View|M, 8", 8, NULL}, -{ 0, "Z View|M, 9", 9, NULL}, +{ 0, "X View|Ctrl M, 7", 7, NULL}, +{ 0, "Y View|Ctrl M, 8", 8, NULL}, +{ 0, "Z View|Ctrl M, 9", 9, NULL}, { -1, "", 0, do_view3d_edit_mirrormenu}}; static TBitem tb_transform_editmode1[]= { |