diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-11-05 16:07:19 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-11-05 16:12:28 +0300 |
| commit | 58dc114615449b8fc13e3b05ec3c21390547f5c7 (patch) | |
| tree | 1d0ff6108d39c3bbcc98e0443e3a437ec5a97399 /source/blender/editors/transform/transform.c | |
| parent | d2ea1b2dcd536cc8a9e53bd830f0095f6bf9e2fe (diff) | |
| parent | 18d7fbe4f58c86f6f91b1e9e5c1f7f0c593a1d0f (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/transform/transform.c')
| -rw-r--r-- | source/blender/editors/transform/transform.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c index 40309b701a4..494cf3459df 100644 --- a/source/blender/editors/transform/transform.c +++ b/source/blender/editors/transform/transform.c @@ -4370,7 +4370,7 @@ static void headerTranslation(TransInfo *t, const float vec[3], char str[UI_MAX_ const char *str_dir = (snode->insert_ofs_dir == SNODE_INSERTOFS_DIR_RIGHT) ? IFACE_("right") : IFACE_("left"); char str_km[64]; - WM_modalkeymap_items_to_string(t->keymap, TFM_MODAL_INSERTOFS_TOGGLE_DIR, true, sizeof(str_km), str_km); + WM_modalkeymap_items_to_string(t->keymap, TFM_MODAL_INSERTOFS_TOGGLE_DIR, true, str_km, sizeof(str_km)); ofs += BLI_snprintf(str, UI_MAX_DRAW_STR, IFACE_("Auto-offset set to %s - press %s to toggle direction | %s"), str_dir, str_km, str_old); @@ -4586,7 +4586,7 @@ static void applyShrinkFatten(TransInfo *t, const int UNUSED(mval[2])) if (t->keymap) { wmKeyMapItem *kmi = WM_modalkeymap_find_propvalue(t->keymap, TFM_MODAL_RESIZE); if (kmi) { - ofs += WM_keymap_item_to_string(kmi, false, sizeof(str) - ofs, str + ofs); + ofs += WM_keymap_item_to_string(kmi, false, str + ofs, sizeof(str) - ofs); } } BLI_snprintf(str + ofs, sizeof(str) - ofs, IFACE_(" or Alt) Even Thickness %s"), @@ -8030,7 +8030,7 @@ static void headerSeqSlide(TransInfo *t, const float val[2], char str[UI_MAX_DRA if (t->keymap) { wmKeyMapItem *kmi = WM_modalkeymap_find_propvalue(t->keymap, TFM_MODAL_TRANSLATE); if (kmi) { - ofs += WM_keymap_item_to_string(kmi, false, UI_MAX_DRAW_STR - ofs, str + ofs); + ofs += WM_keymap_item_to_string(kmi, false, str + ofs, UI_MAX_DRAW_STR - ofs); } } ofs += BLI_snprintf(str + ofs, UI_MAX_DRAW_STR - ofs, IFACE_(" or Alt) Expand to fit %s"), |