Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Tue, 10 Jul 2018 05:42:16 +0000 (07:42 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 10 Jul 2018 05:42:16 +0000 (07:42 +0200)
source/blender/editors/space_view3d/view3d_edit.c
source/blender/editors/space_view3d/view3d_fly.c
source/blender/editors/space_view3d/view3d_walk.c
source/blender/editors/transform/transform.c

index d4c2f5babb176def966a76ea76c2ae6add37638b..95040e04d2096e4c3904228052e551b1dadd7395 100644 (file)
@@ -567,8 +567,8 @@ void viewrotate_modal_keymap(wmKeyConfig *keyconf)
        static const EnumPropertyItem modal_items[] = {
                {VIEW_MODAL_CONFIRM,    "CONFIRM", 0, "Confirm", ""},
 
-               {VIEWROT_MODAL_AXIS_SNAP_ENABLE,    "AXIS_SNAP_ENABLE", 0, "Enable Axis Snap", ""},
-               {VIEWROT_MODAL_AXIS_SNAP_DISABLE,   "AXIS_SNAP_DISABLE", 0, "Disable Axis Snap", ""},
+               {VIEWROT_MODAL_AXIS_SNAP_ENABLE,    "AXIS_SNAP_ENABLE", 0, "Axis Snap", ""},
+               {VIEWROT_MODAL_AXIS_SNAP_DISABLE,   "AXIS_SNAP_DISABLE", 0, "Axis Snap (Off)", ""},
 
                {VIEWROT_MODAL_SWITCH_ZOOM, "SWITCH_TO_ZOOM", 0, "Switch to Zoom"},
                {VIEWROT_MODAL_SWITCH_MOVE, "SWITCH_TO_MOVE", 0, "Switch to Move"},
index 8c6bbaa94da304d1871a602a324306dc29c816ac..d1b9f95ca2a1227583ccb3d084cff0e0e1a3d19c 100644 (file)
@@ -102,29 +102,30 @@ typedef enum eFlyPanState {
 void fly_modal_keymap(wmKeyConfig *keyconf)
 {
        static const EnumPropertyItem modal_items[] = {
-               {FLY_MODAL_CANCEL, "CANCEL", 0, "Cancel", ""},
                {FLY_MODAL_CONFIRM, "CONFIRM", 0, "Confirm", ""},
-               {FLY_MODAL_ACCELERATE, "ACCELERATE", 0, "Accelerate", ""},
-               {FLY_MODAL_DECELERATE, "DECELERATE", 0, "Decelerate", ""},
+               {FLY_MODAL_CANCEL, "CANCEL", 0, "Cancel", ""},
 
-               {FLY_MODAL_PAN_ENABLE, "PAN_ENABLE", 0, "Pan Enable", ""},
-               {FLY_MODAL_PAN_DISABLE, "PAN_DISABLE", 0, "Pan Disable", ""},
+               {FLY_MODAL_DIR_FORWARD, "FORWARD", 0, "Forward", ""},
+               {FLY_MODAL_DIR_BACKWARD, "BACKWARD", 0, "Backward", ""},
+               {FLY_MODAL_DIR_LEFT, "LEFT", 0, "Left", ""},
+               {FLY_MODAL_DIR_RIGHT, "RIGHT", 0, "Right", ""},
+               {FLY_MODAL_DIR_UP, "UP", 0, "Up", ""},
+               {FLY_MODAL_DIR_DOWN, "DOWN", 0, "Down", ""},
 
-               {FLY_MODAL_DIR_FORWARD, "FORWARD", 0, "Fly Forward", ""},
-               {FLY_MODAL_DIR_BACKWARD, "BACKWARD", 0, "Fly Backward", ""},
-               {FLY_MODAL_DIR_LEFT, "LEFT", 0, "Fly Left", ""},
-               {FLY_MODAL_DIR_RIGHT, "RIGHT", 0, "Fly Right", ""},
-               {FLY_MODAL_DIR_UP, "UP", 0, "Fly Up", ""},
-               {FLY_MODAL_DIR_DOWN, "DOWN", 0, "Fly Down", ""},
+               {FLY_MODAL_PAN_ENABLE, "PAN_ENABLE", 0, "Pan", ""},
+               {FLY_MODAL_PAN_DISABLE, "PAN_DISABLE", 0, "Pan (Off)", ""},
+
+               {FLY_MODAL_ACCELERATE, "ACCELERATE", 0, "Accelerate", ""},
+               {FLY_MODAL_DECELERATE, "DECELERATE", 0, "Decelerate", ""},
 
                {FLY_MODAL_AXIS_LOCK_X, "AXIS_LOCK_X", 0, "X Axis Correction", "X axis correction (toggle)"},
                {FLY_MODAL_AXIS_LOCK_Z, "AXIS_LOCK_Z", 0, "X Axis Correction", "Z axis correction (toggle)"},
 
-               {FLY_MODAL_PRECISION_ENABLE, "PRECISION_ENABLE", 0, "Precision Enable", ""},
-               {FLY_MODAL_PRECISION_DISABLE, "PRECISION_DISABLE", 0, "Precision Disable", ""},
+               {FLY_MODAL_PRECISION_ENABLE, "PRECISION_ENABLE", 0, "Precision", ""},
+               {FLY_MODAL_PRECISION_DISABLE, "PRECISION_DISABLE", 0, "Precision (Off)", ""},
 
-               {FLY_MODAL_FREELOOK_ENABLE, "FREELOOK_ENABLE", 0, "Rotation Enable", ""},
-               {FLY_MODAL_FREELOOK_DISABLE, "FREELOOK_DISABLE", 0, "Rotation Disable", ""},
+               {FLY_MODAL_FREELOOK_ENABLE, "FREELOOK_ENABLE", 0, "Rotation", ""},
+               {FLY_MODAL_FREELOOK_DISABLE, "FREELOOK_DISABLE", 0, "Rotation (Off)", ""},
 
                {0, NULL, 0, NULL, NULL}};
 
@@ -137,8 +138,8 @@ void fly_modal_keymap(wmKeyConfig *keyconf)
        keymap = WM_modalkeymap_add(keyconf, "View3D Fly Modal", modal_items);
 
        /* items for modal map */
-       WM_modalkeymap_add_item(keymap, ESCKEY, KM_PRESS, KM_ANY, 0, FLY_MODAL_CANCEL);
        WM_modalkeymap_add_item(keymap, RIGHTMOUSE, KM_ANY, KM_ANY, 0, FLY_MODAL_CANCEL);
+       WM_modalkeymap_add_item(keymap, ESCKEY, KM_PRESS, KM_ANY, 0, FLY_MODAL_CANCEL);
 
        WM_modalkeymap_add_item(keymap, LEFTMOUSE, KM_ANY, KM_ANY, 0, FLY_MODAL_CONFIRM);
        WM_modalkeymap_add_item(keymap, RETKEY, KM_PRESS, KM_ANY, 0, FLY_MODAL_CONFIRM);
index 7356d4a6eeaa55b8d694b347cdfe299aa0936c4b..4c5150fabddcfeb13ca32357f871d25b5e0b9bd3 100644 (file)
@@ -134,18 +134,15 @@ typedef enum eWalkGravityState {
 void walk_modal_keymap(wmKeyConfig *keyconf)
 {
        static const EnumPropertyItem modal_items[] = {
-               {WALK_MODAL_CANCEL, "CANCEL", 0, "Cancel", ""},
                {WALK_MODAL_CONFIRM, "CONFIRM", 0, "Confirm", ""},
+               {WALK_MODAL_CANCEL, "CANCEL", 0, "Cancel", ""},
 
-               {WALK_MODAL_ACCELERATE, "ACCELERATE", 0, "Accelerate", ""},
-               {WALK_MODAL_DECELERATE, "DECELERATE", 0, "Decelerate", ""},
-
-               {WALK_MODAL_DIR_FORWARD, "FORWARD", 0, "Move Forward", ""},
-               {WALK_MODAL_DIR_BACKWARD, "BACKWARD", 0, "Move Backward", ""},
-               {WALK_MODAL_DIR_LEFT, "LEFT", 0, "Move Left (Strafe)", ""},
-               {WALK_MODAL_DIR_RIGHT, "RIGHT", 0, "Move Right (Strafe)", ""},
-               {WALK_MODAL_DIR_UP, "UP", 0, "Move Up", ""},
-               {WALK_MODAL_DIR_DOWN, "DOWN", 0, "Move Down", ""},
+               {WALK_MODAL_DIR_FORWARD, "FORWARD", 0, "Forward", ""},
+               {WALK_MODAL_DIR_BACKWARD, "BACKWARD", 0, "Backward", ""},
+               {WALK_MODAL_DIR_LEFT, "LEFT", 0, "Left (Strafe)", ""},
+               {WALK_MODAL_DIR_RIGHT, "RIGHT", 0, "Right (Strafe)", ""},
+               {WALK_MODAL_DIR_UP, "UP", 0, "Up", ""},
+               {WALK_MODAL_DIR_DOWN, "DOWN", 0, "Down", ""},
 
                {WALK_MODAL_DIR_FORWARD_STOP, "FORWARD_STOP", 0, "Stop Move Forward", ""},
                {WALK_MODAL_DIR_BACKWARD_STOP, "BACKWARD_STOP", 0, "Stop Mode Backward", ""},
@@ -156,14 +153,17 @@ void walk_modal_keymap(wmKeyConfig *keyconf)
 
                {WALK_MODAL_TELEPORT, "TELEPORT", 0, "Teleport", "Move forward a few units at once"},
 
-               {WALK_MODAL_FAST_ENABLE, "FAST_ENABLE", 0, "Fast Enable", "Move faster (walk or fly)"},
-               {WALK_MODAL_FAST_DISABLE, "FAST_DISABLE", 0, "Fast Disable", "Resume regular speed"},
+               {WALK_MODAL_ACCELERATE, "ACCELERATE", 0, "Accelerate", ""},
+               {WALK_MODAL_DECELERATE, "DECELERATE", 0, "Decelerate", ""},
+
+               {WALK_MODAL_FAST_ENABLE, "FAST_ENABLE", 0, "Fast", "Move faster (walk or fly)"},
+               {WALK_MODAL_FAST_DISABLE, "FAST_DISABLE", 0, "Fast (Off)", "Resume regular speed"},
 
-               {WALK_MODAL_SLOW_ENABLE, "SLOW_ENABLE", 0, "Slow Enable", "Move slower (walk or fly)"},
-               {WALK_MODAL_SLOW_DISABLE, "SLOW_DISABLE", 0, "Slow Disable", "Resume regular speed"},
+               {WALK_MODAL_SLOW_ENABLE, "SLOW_ENABLE", 0, "Slow", "Move slower (walk or fly)"},
+               {WALK_MODAL_SLOW_DISABLE, "SLOW_DISABLE", 0, "Slow (Off)", "Resume regular speed"},
 
                {WALK_MODAL_JUMP, "JUMP", 0, "Jump", "Jump when in walk mode"},
-               {WALK_MODAL_JUMP_STOP, "JUMP_STOP", 0, "Jump Stop", "Stop pushing jump"},
+               {WALK_MODAL_JUMP_STOP, "JUMP_STOP", 0, "Jump (Off)", "Stop pushing jump"},
 
                {WALK_MODAL_TOGGLE, "GRAVITY_TOGGLE", 0, "Toggle Gravity", "Toggle gravity effect"},
 
@@ -178,8 +178,8 @@ void walk_modal_keymap(wmKeyConfig *keyconf)
        keymap = WM_modalkeymap_add(keyconf, "View3D Walk Modal", modal_items);
 
        /* items for modal map */
-       WM_modalkeymap_add_item(keymap, ESCKEY, KM_PRESS, KM_ANY, 0, WALK_MODAL_CANCEL);
        WM_modalkeymap_add_item(keymap, RIGHTMOUSE, KM_ANY, KM_ANY, 0, WALK_MODAL_CANCEL);
+       WM_modalkeymap_add_item(keymap, ESCKEY, KM_PRESS, KM_ANY, 0, WALK_MODAL_CANCEL);
 
        WM_modalkeymap_add_item(keymap, LEFTMOUSE, KM_ANY, KM_ANY, 0, WALK_MODAL_CONFIRM);
        WM_modalkeymap_add_item(keymap, RETKEY, KM_PRESS, KM_ANY, 0, WALK_MODAL_CONFIRM);
index b2fa363007f309e54f3454adac71ab77c8f47a4b..db974c3b4db404b8eb8df2b268068da5a1322ac7 100644 (file)
@@ -904,8 +904,8 @@ wmKeyMap *transform_modal_keymap(wmKeyConfig *keyconf)
                {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_INV_ON, "SNAP_INV_ON", 0, "Snap Invert", ""},
+               {TFM_MODAL_SNAP_INV_OFF, "SNAP_INV_OFF", 0, "Snap Invert (Off)", ""},
                {TFM_MODAL_SNAP_TOGGLE, "SNAP_TOGGLE", 0, "Snap Toggle", ""},
                {TFM_MODAL_ADD_SNAP, "ADD_SNAP", 0, "Add Snap Point", ""},
                {TFM_MODAL_REMOVE_SNAP, "REMOVE_SNAP", 0, "Remove Last Snap Point", ""},