griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'master' into blender2.8

Browse Source
This commit is contained in:
Campbell Barton
2018-07-09 07:42:46 +02:00
parent 4c5541feef 6793aebad2
commit ac8aff2b28
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
source/blender/editors/transform/transform.c
View File

@@ -819,13 +819,13 @@ wmKeyMap *transform_modal_keymap(wmKeyConfig *keyconf)
static const EnumPropertyItem modal_items[] = {
{TFM_MODAL_CONFIRM, "CONFIRM", 0, "Confirm", ""},
{TFM_MODAL_CANCEL, "CANCEL", 0, "Cancel", ""},
{TFM_MODAL_AXIS_X, "AXIS_X", 0, "Orientation X axis", ""},
{TFM_MODAL_AXIS_Y, "AXIS_Y", 0, "Orientation Y axis", ""},
{TFM_MODAL_AXIS_Z, "AXIS_Z", 0, "Orientation Z axis", ""},
{TFM_MODAL_PLANE_X, "PLANE_X", 0, "Orientation X plane", ""},
{TFM_MODAL_PLANE_Y, "PLANE_Y", 0, "Orientation Y plane", ""},
{TFM_MODAL_PLANE_Z, "PLANE_Z", 0, "Orientation Z plane", ""},
{TFM_MODAL_CONS_OFF, "CONS_OFF", 0, "Remove Constraints", ""},
{TFM_MODAL_AXIS_X, "AXIS_X", 0, "X axis", ""},
{TFM_MODAL_AXIS_Y, "AXIS_Y", 0, "Y axis", ""},
{TFM_MODAL_AXIS_Z, "AXIS_Z", 0, "Z axis", ""},
{TFM_MODAL_PLANE_X, "PLANE_X", 0, "X plane", ""},
{TFM_MODAL_PLANE_Y, "PLANE_Y", 0, "Y plane", ""},
{TFM_MODAL_PLANE_Z, "PLANE_Z", 0, "Z plane", ""},
{TFM_MODAL_CONS_OFF, "CONS_OFF", 0, "Clear Constraints", ""},
{TFM_MODAL_SNAP_INV_ON, "SNAP_INV_ON", 0, "Invert Snap", ""},
{TFM_MODAL_SNAP_INV_OFF, "SNAP_INV_OFF", 0, "Invert Snap Off", ""},
{TFM_MODAL_SNAP_TOGGLE, "SNAP_TOGGLE", 0, "Snap Toggle", ""},