diff options
author | Yiming Wu <xp8110@outlook.com> | 2019-06-12 16:35:05 +0300 |
---|---|---|
committer | Yiming Wu <xp8110@outlook.com> | 2019-06-12 16:35:05 +0300 |
commit | e09dfe644ba10ecbb330dbb5ed8c1f1a3bfca251 (patch) | |
tree | f6f5329e7ffcbee774b1c3eae49463e9f8993675 /source/blender/editors/mesh/editmesh_tools.c | |
parent | 6034edfb416bd02da8d082a5c012fde4d65c0d59 (diff) | |
parent | 7a50d078fe4125788dfb084cd23a5164070fe69b (diff) |
Merge remote-tracking branch 'origin/master' into soc-2019-npr
# Conflicts:
# release/datafiles/locale
# release/scripts/addons
# release/scripts/addons_contrib
Diffstat (limited to 'source/blender/editors/mesh/editmesh_tools.c')
-rw-r--r-- | source/blender/editors/mesh/editmesh_tools.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/editors/mesh/editmesh_tools.c b/source/blender/editors/mesh/editmesh_tools.c index 60c6994eb2e..97bdb3a7a5d 100644 --- a/source/blender/editors/mesh/editmesh_tools.c +++ b/source/blender/editors/mesh/editmesh_tools.c @@ -7719,11 +7719,11 @@ static void point_normals_update_header(bContext *C, wmOperator *op) BLI_snprintf(header, sizeof(header), - IFACE_("%s: confirm, %s: cancel, " - "%s: point to mouse (%s), %s: point to Pivot, " - "%s: point to object origin, %s: reset normals, " - "%s: set & point to 3D cursor, %s: select & point to mesh item, " - "%s: invert normals (%s), %s: spherize (%s), %s: align (%s)"), + TIP_("%s: confirm, %s: cancel, " + "%s: point to mouse (%s), %s: point to Pivot, " + "%s: point to object origin, %s: reset normals, " + "%s: set & point to 3D cursor, %s: select & point to mesh item, " + "%s: invert normals (%s), %s: spherize (%s), %s: align (%s)"), WM_MODALKEY(EDBM_CLNOR_MODAL_CONFIRM), WM_MODALKEY(EDBM_CLNOR_MODAL_CANCEL), WM_MODALKEY(EDBM_CLNOR_MODAL_POINTTO_USE_MOUSE), |