10 files changed, 76 insertions, 51 deletions
diff --git a/source/blender/makesdna/DNA_action_types.h b/source/blender/makesdna/DNA_action_types.h
index 82b20483902..1ca724b7108 100644
--- a/source/blender/makesdna/DNA_action_types.h
+++ b/source/blender/makesdna/DNA_action_types.h
@@ -478,9 +478,6 @@ typedef struct bPose {
 
   short flag;
   char _pad[2];
-  /** Proxy layer: copy from armature, gets synced. */
-  unsigned int proxy_layer;
-  char _pad1[4];
 
   /** Local action time of this pose. */
   float ctime;
@@ -503,8 +500,6 @@ typedef struct bPose {
 
   /** Settings for visualization of bone animation. */
   bAnimVizSettings avs;
-  /** Proxy active bone name, MAXBONENAME. */
-  char proxy_act_bone[64];
 } bPose;
 
 /* Pose->flag */
diff --git a/source/blender/makesdna/DNA_armature_types.h b/source/blender/makesdna/DNA_armature_types.h
index 566ffd19669..1005b5186aa 100644
--- a/source/blender/makesdna/DNA_armature_types.h
+++ b/source/blender/makesdna/DNA_armature_types.h
@@ -77,7 +77,7 @@ typedef struct Bone {
   /** dist, weight: for non-deformgroup deforms. */
   float dist, weight;
   /**
-   * The width for block bones.
+   * The width for block bones. The final X/Z bone widths are double these values.
    *
    * \note keep in this order for transform code which stores a pointer to `xwidth`,
    * accessing length and `zwidth` as offsets.
diff --git a/source/blender/makesdna/DNA_constraint_types.h b/source/blender/makesdna/DNA_constraint_types.h
index d587bd8082b..53b1a60e53e 100644
--- a/source/blender/makesdna/DNA_constraint_types.h
+++ b/source/blender/makesdna/DNA_constraint_types.h
@@ -714,8 +714,6 @@ typedef enum eBConstraint_Flags {
   CONSTRAINT_SPACEONCE = (1 << 6),
   /* influence ipo is on constraint itself, not in action channel */
   CONSTRAINT_OWN_IPO = (1 << 7),
-  /* indicates that constraint was added locally (i.e.  didn't come from the proxy-lib) */
-  CONSTRAINT_PROXY_LOCAL = (1 << 8),
   /* indicates that constraint is temporarily disabled (only used in GE) */
   CONSTRAINT_OFF = (1 << 9),
   /* use bbone curve shape when calculating headtail values (also used by dependency graph!) */
diff --git a/source/blender/makesdna/DNA_customdata_types.h b/source/blender/makesdna/DNA_customdata_types.h
index 629a5e88de7..ddeab9a0759 100644
--- a/source/blender/makesdna/DNA_customdata_types.h
+++ b/source/blender/makesdna/DNA_customdata_types.h
@@ -160,10 +160,10 @@ typedef enum CustomDataType {
   CD_CUSTOMLOOPNORMAL = 41,
   CD_SCULPT_FACE_SETS = 42,
 
-  /* CD_LOCATION = 43, */ /* UNUSED */
-  /* CD_RADIUS = 44, */   /* UNUSED */
-  CD_HAIRCURVE = 45,
-  CD_HAIRMAPPING = 46,
+  /* CD_LOCATION = 43, */    /* UNUSED */
+  /* CD_RADIUS = 44, */      /* UNUSED */
+  /* CD_HAIRCURVE = 45, */   /* UNUSED, can be reused. */
+  /* CD_HAIRMAPPING = 46, */ /* UNUSED, can be reused. */
 
   CD_PROP_COLOR = 47,
   CD_PROP_FLOAT3 = 48,
diff --git a/source/blender/makesdna/DNA_hair_types.h b/source/blender/makesdna/DNA_hair_types.h
index 2e819b32033..5d54a4bb8cc 100644
--- a/source/blender/makesdna/DNA_hair_types.h
+++ b/source/blender/makesdna/DNA_hair_types.h
@@ -27,48 +27,71 @@
 extern "C" {
 #endif
 
-typedef struct HairCurve {
-  /* Index of first point of hair curve. */
-  int firstpoint;
-  /* Number of points in hair curve, must be 2 or higher. */
-  int numpoints;
-} HairCurve;
-
-/* Hair attachment to a mesh.
- * TODO: attach to tessellated triangles or polygons?
- * TODO: what type of interpolation to use for uv? */
-typedef struct HairMapping {
-  float uv[2];
-  int poly;
-} HairMapping;
+/**
+ * A reusable data structure for geometry consisting of many curves. All control point data is
+ * stored contiguously for better efficiency. Data for each curve is stored as a slice of the
+ * main #point_data array.
+ *
+ * The data structure is meant to be embedded in other data-blocks to allow reusing
+ * curve-processing algorithms for multiple Blender data-block types.
+ */
+typedef struct CurvesGeometry {
+  /**
+   * A runtime pointer to the "position" attribute data.
+   * \note This data is owned by #point_data.
+   */
+  float (*position)[3];
+  /**
+   * A runtime pointer to the "radius" attribute data.
+   * \note This data is owned by #point_data.
+   */
+  float *radius;
+
+  /**
+   * The start index of each curve in the point data. The size of each curve can be calculated by
+   * subtracting the offset from the next offset. That is valid even for the last curve because
+   * this array is allocated with a length one larger than the number of splines.
+   *
+   * \note This is *not* stored in #CustomData because its size is one larger than #curve_data.
+   */
+  int *offsets;
+
+  /**
+   * All attributes stored on control points (#ATTR_DOMAIN_POINT).
+   */
+  CustomData point_data;
+
+  /**
+   * All attributes stored on curves (#ATTR_DOMAIN_CURVE).
+   */
+  CustomData curve_data;
+
+  /**
+   * The total number of control points in all curves.
+   */
+  int point_size;
+  /**
+   * The number of curves in the data-block.
+   */
+  int curve_size;
+} CurvesGeometry;
 
 typedef struct Hair {
   ID id;
-  struct AnimData *adt; /* animation data (must be immediately after id) */
+  /* Animation data (must be immediately after id). */
+  struct AnimData *adt;
 
-  int flag;
-  int _pad1[1];
+  CurvesGeometry geometry;
 
-  /* Geometry */
-  float (*co)[3];
-  float *radius;
-  struct HairCurve *curves;
-  struct HairMaping *mapping;
-  int totpoint;
-  int totcurve;
-
-  /* Custom Data */
-  struct CustomData pdata;
-  struct CustomData cdata;
+  int flag;
   int attributes_active_index;
-  int _pad3;
 
-  /* Material */
+  /* Materials. */
   struct Material **mat;
   short totcol;
   short _pad2[3];
 
-  /* Draw Cache */
+  /* Draw Cache. */
   void *batch_cache;
 } Hair;
 
diff --git a/source/blender/makesdna/DNA_meshdata_types.h b/source/blender/makesdna/DNA_meshdata_types.h
index 22c523901c0..b0276d010a4 100644
--- a/source/blender/makesdna/DNA_meshdata_types.h
+++ b/source/blender/makesdna/DNA_meshdata_types.h
@@ -48,7 +48,6 @@ typedef struct MVert {
 /** #MVert.flag */
 enum {
   /*  SELECT = (1 << 0), */
-  ME_VERT_TMP_TAG = (1 << 2),
   ME_HIDE = (1 << 4),
   ME_VERT_FACEDOT = (1 << 5),
   /*  ME_VERT_MERGED = (1 << 6), */
diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h
index 602f968634e..ce735ad79c4 100644
--- a/source/blender/makesdna/DNA_object_types.h
+++ b/source/blender/makesdna/DNA_object_types.h
@@ -263,9 +263,10 @@ typedef struct Object {
   /** String describing subobject info, MAX_ID_NAME-2. */
   char parsubstr[64];
   struct Object *parent, *track;
-  /* If `ob->proxy` (or proxy_group), this object is proxy for object `ob->proxy`. */
-  /* proxy_from is set in target back to the proxy. */
-  struct Object *proxy, *proxy_group, *proxy_from;
+  /* Proxy pointer are deprecated, only kept for conversion to liboverrides. */
+  struct Object *proxy DNA_DEPRECATED;
+  struct Object *proxy_group DNA_DEPRECATED;
+  struct Object *proxy_from DNA_DEPRECATED;
   /** Old animation system, deprecated for 2.5. */
   struct Ipo *ipo DNA_DEPRECATED;
   /* struct Path *path; */
diff --git a/source/blender/makesdna/DNA_outliner_types.h b/source/blender/makesdna/DNA_outliner_types.h
index a50d0524998..71a5c0eb2e5 100644
--- a/source/blender/makesdna/DNA_outliner_types.h
+++ b/source/blender/makesdna/DNA_outliner_types.h
@@ -101,7 +101,7 @@ typedef enum eTreeStoreElemType {
   TSE_DRIVER_BASE = 16,           /* NO ID */
   /* TSE_DRIVER          = 17, */ /* UNUSED */
 
-  TSE_PROXY = 18,
+  /* TSE_PROXY = 18,           */ /* UNUSED */
   TSE_R_LAYER_BASE = 19,
   TSE_R_LAYER = 20,
   /* TSE_R_PASS          = 21, */ /* UNUSED */
diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h
index 15bb1ef920d..637dd216935 100644
--- a/source/blender/makesdna/DNA_userdef_types.h
+++ b/source/blender/makesdna/DNA_userdef_types.h
@@ -651,7 +651,6 @@ typedef struct UserDef_Experimental {
   /* Debug options, always available. */
   char use_undo_legacy;
   char no_override_auto_resync;
-  char no_proxy_to_override_conversion;
   char use_cycles_debug;
   char use_geometry_nodes_legacy;
   char show_asset_debug_info;
@@ -666,7 +665,7 @@ typedef struct UserDef_Experimental {
   char use_sculpt_tools_tilt;
   char use_extended_asset_browser;
   char use_override_templates;
-  char _pad[1];
+  char _pad[2];
   /** `makesdna` does not allow empty structs. */
 } UserDef_Experimental;
 
diff --git a/source/blender/makesdna/intern/makesdna.c b/source/blender/makesdna/intern/makesdna.c
index 114c0b40407..d94b95fc6f4 100644
--- a/source/blender/makesdna/intern/makesdna.c
+++ b/source/blender/makesdna/intern/makesdna.c
@@ -1555,8 +1555,18 @@ int main(int argc, char **argv)
         base_directory = BASE_HEADER;
       }
 
+      /* NOTE: #init_structDNA() in dna_genfile.c expects `sdna->data` is 4-bytes aligned.
+       * `DNAstr[]` buffer written by `makesdna` is used for this data, so make `DNAstr` forcefully
+       * 4-bytes aligned. */
+#ifdef __GNUC__
+#  define FORCE_ALIGN_4 " __attribute__((aligned(4))) "
+#else
+#  define FORCE_ALIGN_4 " "
+#endif
       fprintf(file_dna, "extern const unsigned char DNAstr[];\n");
-      fprintf(file_dna, "const unsigned char DNAstr[] = {\n");
+      fprintf(file_dna, "const unsigned char" FORCE_ALIGN_4 "DNAstr[] = {\n");
+#undef FORCE_ALIGN_4
+
       if (make_structDNA(base_directory, file_dna, file_dna_offsets, file_dna_verify)) {
         /* error */
         fclose(file_dna);