4 files changed, 25 insertions, 9 deletions
diff --git a/source/blender/makesdna/DNA_ID.h b/source/blender/makesdna/DNA_ID.h
index 40916cbdc61..063ea04bdba 100644
--- a/source/blender/makesdna/DNA_ID.h
+++ b/source/blender/makesdna/DNA_ID.h
@@ -245,6 +245,12 @@ typedef struct ID {
   int us;
   int icon_id;
   int recalc;
+  /**
+   * Used by undo code. Value of recalc is stored there when reading an ID from memfile, and not
+   * touched by anything, which means it can be used as 'reference' recalc value for the next undo
+   * step, when going backward (i.e. actual undo, redo can just use recalc value directly).
+   */
+  int recalc_undo_accumulated;
 
   /**
    * A session-wide unique identifier for a given ID, that remain the same across potential
@@ -252,6 +258,8 @@ typedef struct ID {
    */
   unsigned int session_uuid;
 
+  char _pad[4];
+
   IDProperty *properties;
 
   /** Reference linked ID which this one overrides. */
@@ -551,6 +559,10 @@ enum {
   /* Datablock was not allocated by standard system (BKE_libblock_alloc), do not free its memory
    * (usual type-specific freeing is called though). */
   LIB_TAG_NOT_ALLOCATED = 1 << 18,
+
+  /* RESET_AFTER_USE Used by undo system to tag unchanged IDs re-used from old Main (instead of
+   * read from memfile). */
+  LIB_TAG_UNDO_OLD_ID_REUSED = 1 << 19,
 };
 
 /* Tag given ID for an update in all the dependency graphs. */
diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h
index 6961a9e9c3e..904d7b8a52e 100644
--- a/source/blender/makesdna/DNA_userdef_types.h
+++ b/source/blender/makesdna/DNA_userdef_types.h
@@ -613,7 +613,8 @@ typedef struct UserDef_FileSpaceData {
 } UserDef_FileSpaceData;
 
 typedef struct UserDef_Experimental {
-  char _pad0[8]; /* makesdna does not allow empty structs. */
+  char use_undo_speedup;
+  char _pad0[7]; /* makesdna does not allow empty structs. */
 } UserDef_Experimental;
 
 #define USER_EXPERIMENTAL_TEST(userdef, member) \
diff --git a/source/blender/makesdna/DNA_view3d_types.h b/source/blender/makesdna/DNA_view3d_types.h
index edc86a4b0ea..a25d66cbc9b 100644
--- a/source/blender/makesdna/DNA_view3d_types.h
+++ b/source/blender/makesdna/DNA_view3d_types.h
@@ -265,14 +265,14 @@ typedef struct View3D {
   short persp DNA_DEPRECATED;
   short view DNA_DEPRECATED;
 
-  struct Object *camera, *ob_centre;
+  struct Object *camera, *ob_center;
   rctf render_border;
 
   /** Allocated backup of its self while in localview. */
   struct View3D *localvd;
 
   /** Optional string for armature bone to define center, MAXBONENAME. */
-  char ob_centre_bone[64];
+  char ob_center_bone[64];
 
   unsigned short local_view_uuid;
   char _pad6[2];
@@ -281,7 +281,7 @@ typedef struct View3D {
   short _pad7[3];
 
   /** Optional bool for 3d cursor to define center. */
-  short ob_centre_cursor;
+  short ob_center_cursor;
   short scenelock;
   short gp_flag;
   short flag;
diff --git a/source/blender/makesdna/intern/dna_rename_defs.h b/source/blender/makesdna/intern/dna_rename_defs.h
index 678baef3cef..aabc16c4111 100644
--- a/source/blender/makesdna/intern/dna_rename_defs.h
+++ b/source/blender/makesdna/intern/dna_rename_defs.h
@@ -64,6 +64,8 @@ DNA_STRUCT_RENAME_ELEM(Bone, curveOutX, curve_out_x)
 DNA_STRUCT_RENAME_ELEM(Bone, curveOutY, curve_out_y)
 DNA_STRUCT_RENAME_ELEM(Bone, scaleIn, scale_in_x)
 DNA_STRUCT_RENAME_ELEM(Bone, scaleOut, scale_out_x)
+DNA_STRUCT_RENAME_ELEM(BrushGpencilSettings, gradient_f, hardeness)
+DNA_STRUCT_RENAME_ELEM(BrushGpencilSettings, gradient_s, aspect_ratio)
 DNA_STRUCT_RENAME_ELEM(Camera, YF_dofdist, dof_distance)
 DNA_STRUCT_RENAME_ELEM(Camera, clipend, clip_end)
 DNA_STRUCT_RENAME_ELEM(Camera, clipsta, clip_start)
@@ -83,8 +85,14 @@ DNA_STRUCT_RENAME_ELEM(ParticleSettings, dup_group, instance_collection)
 DNA_STRUCT_RENAME_ELEM(ParticleSettings, dup_ob, instance_object)
 DNA_STRUCT_RENAME_ELEM(ParticleSettings, dupliweights, instance_weights)
 DNA_STRUCT_RENAME_ELEM(ThemeSpace, scrubbing_background, time_scrub_background)
+DNA_STRUCT_RENAME_ELEM(ThemeSpace, show_back_grad, background_type)
 DNA_STRUCT_RENAME_ELEM(View3D, far, clip_end)
 DNA_STRUCT_RENAME_ELEM(View3D, near, clip_start)
+DNA_STRUCT_RENAME_ELEM(View3D, ob_centre, ob_center)
+DNA_STRUCT_RENAME_ELEM(View3D, ob_centre_bone, ob_center_bone)
+DNA_STRUCT_RENAME_ELEM(View3D, ob_centre_cursor, ob_center_cursor)
+DNA_STRUCT_RENAME_ELEM(bGPDstroke, gradient_f, hardeness)
+DNA_STRUCT_RENAME_ELEM(bGPDstroke, gradient_s, aspect_ratio)
 DNA_STRUCT_RENAME_ELEM(bPoseChannel, curveInX, curve_in_x)
 DNA_STRUCT_RENAME_ELEM(bPoseChannel, curveInY, curve_in_y)
 DNA_STRUCT_RENAME_ELEM(bPoseChannel, curveOutX, curve_out_x)
@@ -109,8 +117,3 @@ DNA_STRUCT_RENAME_ELEM(bTheme, tstatusbar, space_statusbar)
 DNA_STRUCT_RENAME_ELEM(bTheme, ttopbar, space_topbar)
 DNA_STRUCT_RENAME_ELEM(bTheme, tuserpref, space_preferences)
 DNA_STRUCT_RENAME_ELEM(bTheme, tv3d, space_view3d)
-DNA_STRUCT_RENAME_ELEM(ThemeSpace, show_back_grad, background_type)
-DNA_STRUCT_RENAME_ELEM(bGPDstroke, gradient_f, hardeness)
-DNA_STRUCT_RENAME_ELEM(bGPDstroke, gradient_s, aspect_ratio)
-DNA_STRUCT_RENAME_ELEM(BrushGpencilSettings, gradient_f, hardeness)
-DNA_STRUCT_RENAME_ELEM(BrushGpencilSettings, gradient_s, aspect_ratio)