2 files changed, 12 insertions, 5 deletions
diff --git a/source/blender/makesdna/DNA_gpencil_types.h b/source/blender/makesdna/DNA_gpencil_types.h
index 3340782d64a..e6ae90489a5 100644
--- a/source/blender/makesdna/DNA_gpencil_types.h
+++ b/source/blender/makesdna/DNA_gpencil_types.h
@@ -326,7 +326,8 @@ typedef struct bGPDstroke {
   /** Curve used to edit the stroke using Bezier handlers. */
   struct bGPDcurve *editcurve;
 
-  /* NOTE: When adding new members, make sure to add them to BKE_gpencil_stroke_copy_settings as well! */
+  /* NOTE: When adding new members, make sure to add them to BKE_gpencil_stroke_copy_settings as
+   * well! */
 
   bGPDstroke_Runtime runtime;
   void *_pad5;
@@ -412,7 +413,8 @@ typedef struct bGPDframe {
   /** Keyframe type (eBezTriple_KeyframeType). */
   short key_type;
 
-  /* NOTE: When adding new members, make sure to add them to BKE_gpencil_frame_copy_settings as well! */
+  /* NOTE: When adding new members, make sure to add them to BKE_gpencil_frame_copy_settings as
+   * well! */
 
   bGPDframe_Runtime runtime;
 } bGPDframe;
@@ -537,7 +539,8 @@ typedef struct bGPDlayer {
   float layer_mat[4][4], layer_invmat[4][4];
   char _pad3[4];
 
-  /* NOTE: When adding new members, make sure to add them to BKE_gpencil_layer_copy_settings as well! */
+  /* NOTE: When adding new members, make sure to add them to BKE_gpencil_layer_copy_settings as
+   * well! */
 
   bGPDlayer_Runtime runtime;
 } bGPDlayer;
@@ -640,7 +643,6 @@ typedef struct bGPdata_Runtime {
   Brush *sbuffer_brush;
   struct GpencilBatchCache *gpencil_cache;
   struct LineartCache *lineart_cache;
-
   struct GPencilUpdateCache *update_cache;
 } bGPdata_Runtime;
 
@@ -735,7 +737,8 @@ typedef struct bGPdata {
 
   bGPgrid grid;
 
-  /* NOTE: When adding new members, make sure to add them to BKE_gpencil_data_copy_settings as well! */
+  /* NOTE: When adding new members, make sure to add them to BKE_gpencil_data_copy_settings as
+   * well! */
 
   bGPdata_Runtime runtime;
 } bGPdata;
@@ -807,6 +810,9 @@ typedef enum eGPdata_Flag {
   GP_DATA_CURVE_EDIT_MODE = (1 << 21),
   /* Use adaptive curve resolution */
   GP_DATA_CURVE_ADAPTIVE_RESOLUTION = (1 << 22),
+  /* Update cache was fully dealt with and is ready to be freed. In this state, it should no longer
+     be written to (but still can be read). */
+  GP_DATA_UPDATE_CACHE_DISPOSABLE = (1 << 23),
 } eGPdata_Flag;
 
 /* gpd->onion_flag */
diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h
index 5fd18ccf64d..a03bf082861 100644
--- a/source/blender/makesdna/DNA_userdef_types.h
+++ b/source/blender/makesdna/DNA_userdef_types.h
@@ -656,6 +656,7 @@ typedef struct UserDef_Experimental {
   char show_asset_debug_info;
   char no_asset_indexing;
   char use_gpencil_update_cache;
+  char use_gpencil_undo_system;
   char SANITIZE_AFTER_HERE;
   /* The following options are automatically sanitized (set to 0)
    * when the release cycle is not alpha. */