kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

bugfix [#24685] Changing mode bypasses undo suppression

Browse Source 
Editmode undo operator was using the operator OPTYPE_UNDO flag as well as its own EM_DO_UNDO option.

This gave 2 problems.
- python suppressed undos would fail (as in the report).
- Undo push was called twice on exiting editmode for no reason.

Use the operator undo in this case.
This commit is contained in:
Campbell Barton 2010-11-17 15:16:49 +00:00
parent 5a37333053
commit c8bcabaf40
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/editors/object/object_edit.c
View File

@ -511,7 +511,7 @@ static int editmode_toggle_exec(bContext *C, wmOperator *UNUSED(op))
if(!CTX_data_edit_object(C)) if(!CTX_data_edit_object(C))
ED_object_enter_editmode(C, EM_WAITCURSOR); ED_object_enter_editmode(C, EM_WAITCURSOR);
else else
ED_object_exit_editmode(C, EM_FREEDATA|EM_FREEUNDO|EM_WAITCURSOR|EM_DO_UNDO); ED_object_exit_editmode(C, EM_FREEDATA|EM_FREEUNDO|EM_WAITCURSOR); /* had EM_DO_UNDO but op flag calls undo too [#24685] */
return OPERATOR_FINISHED; return OPERATOR_FINISHED;
} }