Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix T67256: Add object redo duplicates, after exiting sculpt mode

Browse Source
This commit is contained in:
Campbell Barton
2019-07-26 14:24:38 +10:00
parent ac7fe46ec3
commit cf0f2f2d3d
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
source/blender/blenkernel/intern/undo_system.c
View File

@@ -560,12 +560,15 @@ bool BKE_undosys_step_push_with_type(UndoStack *ustack,
} }
if (use_memfile_step) { if (use_memfile_step) {
const char *name_internal = "MemFile Internal (post)"; /* Make this the user visible undo state, so redo always applies
* on top of the mem-file undo instead of skipping it. see: T67256. */
UndoStep *us_prev = ustack->step_active;
const char *name_internal = us_prev->name;
const bool ok = undosys_stack_push_main(ustack, name_internal, G_MAIN); const bool ok = undosys_stack_push_main(ustack, name_internal, G_MAIN);
if (ok) { if (ok) {
UndoStep *us = ustack->steps.last; UndoStep *us = ustack->steps.last;
BLI_assert(STREQ(us->name, name_internal)); BLI_assert(STREQ(us->name, name_internal));
us->skip = true; us_prev->skip = true;
#ifdef WITH_GLOBAL_UNDO_CORRECT_ORDER #ifdef WITH_GLOBAL_UNDO_CORRECT_ORDER
ustack->step_active_memfile = us; ustack->step_active_memfile = us;
#endif #endif