Merge branch 'blender-v2.81-release'

1 files changed, 7 insertions, 0 deletions

diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c
index f7a5052b74a..6032c3615c6 100644
--- a/source/blender/editors/sculpt_paint/sculpt.c
+++ b/source/blender/editors/sculpt_paint/sculpt.c
@@ -7876,6 +7876,13 @@ static int sculpt_mode_toggle_exec(bContext *C, wmOperator *op)
 
   WM_toolsystem_update_from_context_view3d(C);
 
+  /* Without this the memfile undo step is used,
+   * while it works it causes lag when undoing the first undo step, see T71564. */
+  wmWindowManager *wm = CTX_wm_manager(C);
+  if (wm->op_undo_depth <= 1) {
+    sculpt_undo_push_begin(op->type->name);
+  }
+
   return OPERATOR_FINISHED;
 }