Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Mon, 9 Jul 2018 05:42:46 +0000 (07:42 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 9 Jul 2018 05:42:46 +0000 (07:42 +0200)
source/blender/editors/transform/transform.c

index 44c3c5e912470418bd0ee5a251e5a58382ab30a2..506ec024203c468d5ebc6a665945e9e512a27a0c 100644 (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", ""},