diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-01-09 12:25:12 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-01-09 12:27:02 +0300 |
commit | 06d1c2f7373d3b506675dd671661be26bc50704f (patch) | |
tree | 32638837bdbf1bcd51acd600842c54cedeb2c16d | |
parent | 3cbe2a19dffdcf9aea5fee28fba4f2e66dcff08a (diff) |
Fix T55336: Crash w/ dyntopo sculpt
-rw-r--r-- | source/blender/blenkernel/intern/undo_system.c | 40 |
1 files changed, 35 insertions, 5 deletions
diff --git a/source/blender/blenkernel/intern/undo_system.c b/source/blender/blenkernel/intern/undo_system.c index 139f6a20a59..fa3abfd33f0 100644 --- a/source/blender/blenkernel/intern/undo_system.c +++ b/source/blender/blenkernel/intern/undo_system.c @@ -253,6 +253,35 @@ void BKE_undosys_stack_clear_active(UndoStack *ustack) } } +/* Caller is responsible for handling active. */ +static void undosys_stack_clear_all_last(UndoStack *ustack, UndoStep *us) +{ + if (us) { + bool is_not_empty = true; + UndoStep *us_iter; + do { + us_iter = ustack->steps.last; + BLI_assert(us_iter != ustack->step_active); + undosys_step_free_and_unlink(ustack, us_iter); + undosys_stack_validate(ustack, is_not_empty); + } while ((us != us_iter)); + } +} + +static void undosys_stack_clear_all_first(UndoStack *ustack, UndoStep *us) +{ + if (us) { + bool is_not_empty = true; + UndoStep *us_iter; + do { + us_iter = ustack->steps.first; + BLI_assert(us_iter != ustack->step_active); + undosys_step_free_and_unlink(ustack, us_iter); + undosys_stack_validate(ustack, is_not_empty); + } while ((us != us_iter)); + } +} + static bool undosys_stack_push_main(UndoStack *ustack, const char *name, struct Main *bmain) { UNDO_NESTED_ASSERT(false); @@ -364,11 +393,7 @@ void BKE_undosys_stack_limit_steps_and_memory(UndoStack *ustack, int steps, size } #endif /* Free from first to last, free functions may update de-duplication info (see #MemFileUndoStep). */ - while (ustack->steps.first != us) { - UndoStep *us_first = ustack->steps.first; - BLI_assert(us_first != ustack->step_active); - undosys_step_free_and_unlink(ustack, us_first); - } + undosys_stack_clear_all_first(ustack, us->prev); #ifdef WITH_GLOBAL_UNDO_KEEP_ONE if (us_exclude) { @@ -387,6 +412,11 @@ UndoStep *BKE_undosys_step_push_init_with_type(UndoStack *ustack, bContext *C, c BLI_assert(ustack->step_init == NULL); if (ut->step_encode_init) { undosys_stack_validate(ustack, false); + + if (ustack->step_active) { + undosys_stack_clear_all_last(ustack, ustack->step_active->next); + } + UndoStep *us = MEM_callocN(ut->step_size, __func__); CLOG_INFO(&LOG, 1, "addr=%p, name='%s', type='%s'", us, name, ut->name); if (name != NULL) { |