From 5159b8e1eadb3803064a97874f7ebc059ce2be32 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 13 May 2020 23:04:47 +1000 Subject: Fix extra undo step when switching object modes Changing between modes would always add a user visible undo step that set object mode. Avoid storing this extra undo step on object mode switching. --- source/blender/editors/object/object_edit.c | 32 +++++++++++++++++------------ 1 file changed, 19 insertions(+), 13 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 6929930c26c..ab82f3c3f04 100644 --- a/source/blender/editors/object/object_edit.c +++ b/source/blender/editors/object/object_edit.c @@ -1408,28 +1408,34 @@ static int object_mode_set_exec(bContext *C, wmOperator *op) return OPERATOR_PASS_THROUGH; } - if (ob->mode != mode) { - /* we should be able to remove this call, each operator calls */ - ED_object_mode_compat_set(C, ob, mode, op->reports); - } - - /* Exit current mode if it's not the mode we're setting */ - if (mode != OB_MODE_OBJECT && (ob->mode != mode || toggle)) { - /* Enter new mode */ - ED_object_mode_toggle(C, mode); + if (toggle == false) { + if (ob->mode != mode) { + if (mode != OB_MODE_OBJECT) { + /* Enter new mode. */ + ED_object_mode_toggle(C, mode); + } + else { + ED_object_mode_compat_set(C, ob, mode, op->reports); + } + } } + else { + /* Exit current mode if it's not the mode we're setting */ + if (mode != OB_MODE_OBJECT) { + /* Enter new mode. */ + ED_object_mode_toggle(C, mode); + } - if (toggle) { /* Special case for Object mode! */ - if (mode == OB_MODE_OBJECT && restore_mode == OB_MODE_OBJECT && - ob->restore_mode != OB_MODE_OBJECT) { + if ((mode == OB_MODE_OBJECT) && (restore_mode == OB_MODE_OBJECT) && + (ob->restore_mode != OB_MODE_OBJECT)) { ED_object_mode_toggle(C, ob->restore_mode); } else if (ob->mode == mode) { /* For toggling, store old mode so we know what to go back to */ ob->restore_mode = restore_mode; } - else if (ob->restore_mode != OB_MODE_OBJECT && ob->restore_mode != mode) { + else if ((ob->restore_mode != OB_MODE_OBJECT) && (ob->restore_mode != mode)) { ED_object_mode_toggle(C, ob->restore_mode); } } -- cgit v1.2.3