diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2020-05-14 07:52:07 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2020-05-14 07:52:07 +0300 |
| commit | 0cd9b1243cd8d06a68cce7419047fec6b18cfc09 (patch) | |
| tree | 46fa0dd0906f4d6a22cf46a4289f32049d76bccd /source/blender/editors | |
| parent | 95a47ff2269fc97d60cf83a44726d1f49027a882 (diff) | |
Fix sculpt/paint missing undo-step limiting
Diffstat (limited to 'source/blender/editors')
| -rw-r--r-- | source/blender/editors/sculpt_paint/paint_curve_undo.c | 1 | ||||
| -rw-r--r-- | source/blender/editors/sculpt_paint/sculpt_undo.c | 3 | ||||
| -rw-r--r-- | source/blender/editors/space_image/image_undo.c | 1 | ||||
| -rw-r--r-- | source/blender/editors/undo/ed_undo.c | 2 |
4 files changed, 6 insertions, 1 deletions
diff --git a/source/blender/editors/sculpt_paint/paint_curve_undo.c b/source/blender/editors/sculpt_paint/paint_curve_undo.c index 5797eb68dd3..a3daef19f11 100644 --- a/source/blender/editors/sculpt_paint/paint_curve_undo.c +++ b/source/blender/editors/sculpt_paint/paint_curve_undo.c @@ -179,6 +179,7 @@ void ED_paintcurve_undo_push_end(void) { UndoStack *ustack = ED_undo_stack_get(); BKE_undosys_step_push(ustack, NULL, NULL); + BKE_undosys_stack_limit_steps_and_memory_defaults(ustack); WM_file_tag_modified(); } diff --git a/source/blender/editors/sculpt_paint/sculpt_undo.c b/source/blender/editors/sculpt_paint/sculpt_undo.c index 1cb9b57e81d..90fb0a3e4a2 100644 --- a/source/blender/editors/sculpt_paint/sculpt_undo.c +++ b/source/blender/editors/sculpt_paint/sculpt_undo.c @@ -1332,6 +1332,9 @@ void SCULPT_undo_push_end_ex(const bool use_nested_undo) if (wm->op_undo_depth == 0 || use_nested_undo) { UndoStack *ustack = ED_undo_stack_get(); BKE_undosys_step_push(ustack, NULL, NULL); + if (wm->op_undo_depth == 0) { + BKE_undosys_stack_limit_steps_and_memory_defaults(ustack); + } WM_file_tag_modified(); } } diff --git a/source/blender/editors/space_image/image_undo.c b/source/blender/editors/space_image/image_undo.c index cebf47a385d..eb1c46240cb 100644 --- a/source/blender/editors/space_image/image_undo.c +++ b/source/blender/editors/space_image/image_undo.c @@ -1083,6 +1083,7 @@ void ED_image_undo_push_end(void) { UndoStack *ustack = ED_undo_stack_get(); BKE_undosys_step_push(ustack, NULL, NULL); + BKE_undosys_stack_limit_steps_and_memory_defaults(ustack); WM_file_tag_modified(); } diff --git a/source/blender/editors/undo/ed_undo.c b/source/blender/editors/undo/ed_undo.c index 69e7c04b5e5..f7300221028 100644 --- a/source/blender/editors/undo/ed_undo.c +++ b/source/blender/editors/undo/ed_undo.c @@ -97,7 +97,7 @@ void ED_undo_push(bContext *C, const char *str) if (U.undomemory != 0) { const size_t memory_limit = (size_t)U.undomemory * 1024 * 1024; - BKE_undosys_stack_limit_steps_and_memory(wm->undo_stack, 0, memory_limit); + BKE_undosys_stack_limit_steps_and_memory(wm->undo_stack, -1, memory_limit); } if (CLOG_CHECK(&LOG, 1)) { |