From eb24c9a1e1246716820cd031aeb3d755d1325b24 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 30 May 2018 12:46:33 +0200 Subject: 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. --- source/blender/editors/object/object_edit.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'source/blender/editors/object/object_edit.c') 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) { -- cgit v1.2.3