1 files changed, 11 insertions, 8 deletions

diff --git a/source/blender/editors/armature/editarmature_undo.c b/source/blender/editors/armature/editarmature_undo.c
index 4a82a8fccee..4e3ab11a9f7 100644
--- a/source/blender/editors/armature/editarmature_undo.c
+++ b/source/blender/editors/armature/editarmature_undo.c
@@ -32,6 +32,7 @@
 
 #include "BKE_context.h"
 #include "BKE_layer.h"
+#include "BKE_main.h"
 #include "BKE_undo_system.h"
 
 #include "DEG_depsgraph.h"
@@ -142,9 +143,7 @@ static bool armature_undosys_poll(bContext *C)
   return editarm_object_from_context(C) != NULL;
 }
 
-static bool armature_undosys_step_encode(struct bContext *C,
-                                         struct Main *UNUSED(bmain),
-                                         UndoStep *us_p)
+static bool armature_undosys_step_encode(struct bContext *C, struct Main *bmain, UndoStep *us_p)
 {
   ArmatureUndoStep *us = (ArmatureUndoStep *)us_p;
 
@@ -165,17 +164,18 @@ static bool armature_undosys_step_encode(struct bContext *C,
     elem->obedit_ref.ptr = ob;
     bArmature *arm = elem->obedit_ref.ptr->data;
     undoarm_from_editarm(&elem->data, arm);
+    arm->needs_flush_to_id = 1;
     us->step.data_size += elem->data.undo_size;
   }
   MEM_freeN(objects);
+
+  bmain->is_memfile_undo_flush_needed = true;
+
   return true;
 }
 
-static void armature_undosys_step_decode(struct bContext *C,
-                                         struct Main *UNUSED(bmain),
-                                         UndoStep *us_p,
-                                         int UNUSED(dir),
-                                         bool UNUSED(is_final))
+static void armature_undosys_step_decode(
+    struct bContext *C, struct Main *bmain, UndoStep *us_p, int UNUSED(dir), bool UNUSED(is_final))
 {
   ArmatureUndoStep *us = (ArmatureUndoStep *)us_p;
 
@@ -198,6 +198,7 @@ static void armature_undosys_step_decode(struct bContext *C,
       continue;
     }
     undoarm_to_editarm(&elem->data, arm);
+    arm->needs_flush_to_id = 1;
     DEG_id_tag_update(&obedit->id, ID_RECALC_GEOMETRY);
   }
 
@@ -205,6 +206,8 @@ static void armature_undosys_step_decode(struct bContext *C,
   ED_undo_object_set_active_or_warn(
       CTX_data_view_layer(C), us->elems[0].obedit_ref.ptr, us_p->name, &LOG);
 
+  bmain->is_memfile_undo_flush_needed = true;
+
   WM_event_add_notifier(C, NC_GEOM | ND_DATA, NULL);
 }