diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-05-30 13:46:33 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-05-30 13:56:38 +0300 |
| commit | eb24c9a1e1246716820cd031aeb3d755d1325b24 (patch) | |
| tree | 135f15c6cbc39228d446991bfbacd2709aab6c5e /source/blender/editors/object/object_edit.c | |
| parent | 03ec3a61411f8701af104f36af69b2163d1b4278 (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_edit.c')
| -rw-r--r-- | source/blender/editors/object/object_edit.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c index 65fe578a602..85d62c0401f 100644 --- a/source/blender/editors/object/object_edit.c +++ b/source/blender/editors/object/object_edit.c @@ -1360,15 +1360,7 @@ static int object_mode_set_exec(bContext *C, wmOperator *op) const bool toggle = RNA_boolean_get(op->ptr, "toggle"); if (use_submode) { - /* Apply arbitrary fallback modes, see: T55162. */ - if (ob) { - if (ob->type == OB_ARMATURE) { - if (mode == OB_MODE_TEXTURE_PAINT) { - mode = OB_MODE_POSE; - } - } - } - + /* When not changing modes use submodes, see: T55162. */ if (toggle == false) { if (mode == restore_mode) { switch (mode) { |