Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2018-05-30 13:46:33 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-05-30 13:56:38 +0300
commiteb24c9a1e1246716820cd031aeb3d755d1325b24 (patch)
tree135f15c6cbc39228d446991bfbacd2709aab6c5e /source/blender/editors/object/object_ops.c
parent03ec3a61411f8701af104f36af69b2163d1b4278 (diff)
Keymap: Pose/Weight-Paint modes now co-exist
Use the same key for pose & weight paint mode (instead of texture paint) This makes more sense since pose/weight paint modes are often used in combination.
Diffstat (limited to 'source/blender/editors/object/object_ops.c')
-rw-r--r--source/blender/editors/object/object_ops.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/editors/object/object_ops.c b/source/blender/editors/object/object_ops.c
index d40db22d5cf..220668f8a87 100644
--- a/source/blender/editors/object/object_ops.c
+++ b/source/blender/editors/object/object_ops.c
@@ -291,13 +291,13 @@ void ED_keymap_object(wmKeyConfig *keyconf)
/* modes */
{
short key_mode_pair[][2] = {
- {ACCENTGRAVEKEY, OB_MODE_OBJECT},
{ONEKEY, OB_MODE_OBJECT},
{TWOKEY, OB_MODE_EDIT},
- {THREEKEY, OB_MODE_SCULPT},
- {FOURKEY, OB_MODE_TEXTURE_PAINT}, /* or OB_MODE_POSE */
- {FIVEKEY, OB_MODE_VERTEX_PAINT},
- {SIXKEY, OB_MODE_WEIGHT_PAINT},
+ {THREEKEY, OB_MODE_POSE},
+ {THREEKEY, OB_MODE_WEIGHT_PAINT},
+ {FOURKEY, OB_MODE_VERTEX_PAINT},
+ {FIVEKEY, OB_MODE_SCULPT},
+ {SIXKEY, OB_MODE_TEXTURE_PAINT},
{SEVENKEY, OB_MODE_PARTICLE_EDIT},
};