[Bf-blender-cvs] [9fb9bf59967] blender-v2.93-release: Fix: DNA struct alignment on 32 bit
Ray Molenkamp
noreply at git.blender.org
Mon Aug 23 10:51:30 CEST 2021
Commit: 9fb9bf59967d237ee211dbf2a48c28be76233c35
Author: Ray Molenkamp
Date: Wed Aug 11 16:57:56 2021 -0600
Branches: blender-v2.93-release
https://developer.blender.org/rB9fb9bf59967d237ee211dbf2a48c28be76233c35
Fix: DNA struct alignment on 32 bit
Some of the dna structs were not properly
aligned for 32 bit builds causing issues
for some of the 32 platforms Debian builds
for.
Reviewed By: sergey, brecht
Differential Revision: https://developer.blender.org/D9389
===================================================================
M source/blender/makesdna/DNA_gpencil_types.h
M source/blender/makesdna/DNA_mesh_types.h
M source/blender/makesdna/DNA_modifier_types.h
M source/blender/makesdna/DNA_object_types.h
===================================================================
diff --git a/source/blender/makesdna/DNA_gpencil_types.h b/source/blender/makesdna/DNA_gpencil_types.h
index 8facdca2f9c..e414f3afa10 100644
--- a/source/blender/makesdna/DNA_gpencil_types.h
+++ b/source/blender/makesdna/DNA_gpencil_types.h
@@ -322,6 +322,7 @@ typedef struct bGPDstroke {
struct bGPDcurve *editcurve;
bGPDstroke_Runtime runtime;
+ void *_pad5;
} bGPDstroke;
/** #bGPDstroke.flag */
diff --git a/source/blender/makesdna/DNA_mesh_types.h b/source/blender/makesdna/DNA_mesh_types.h
index 3eb5920dfe6..7cd6830559a 100644
--- a/source/blender/makesdna/DNA_mesh_types.h
+++ b/source/blender/makesdna/DNA_mesh_types.h
@@ -229,6 +229,7 @@ typedef struct Mesh {
* default and Face Sets can be used without affecting the color of the mesh. */
int face_sets_color_default;
+ void *_pad2;
Mesh_Runtime runtime;
} Mesh;
diff --git a/source/blender/makesdna/DNA_modifier_types.h b/source/blender/makesdna/DNA_modifier_types.h
index c61e940190f..f944a5fd3d7 100644
--- a/source/blender/makesdna/DNA_modifier_types.h
+++ b/source/blender/makesdna/DNA_modifier_types.h
@@ -136,6 +136,7 @@ typedef struct ModifierData {
/* Runtime field which contains runtime data which is specific to a modifier type. */
void *runtime;
+ void *_pad1;
} ModifierData;
typedef enum {
@@ -215,6 +216,7 @@ typedef struct LatticeModifierData {
float strength;
short flag;
char _pad[2];
+ void *_pad1;
} LatticeModifierData;
/*Lattice modifier flags */
@@ -232,6 +234,7 @@ typedef struct CurveModifierData {
short defaxis;
short flag;
char _pad[4];
+ void *_pad1;
} CurveModifierData;
/* Curve modifier flags */
@@ -283,6 +286,7 @@ typedef struct MaskModifierData {
/** Flags for various things. */
short flag;
float threshold;
+ void *_pad1;
} MaskModifierData;
/* Mask Modifier -> mode */
@@ -373,6 +377,7 @@ typedef struct MirrorModifierData {
float uv_offset[2];
float uv_offset_copy[2];
struct Object *mirror_ob;
+ void *_pad1;
} MirrorModifierData;
/* MirrorModifierData->flag */
@@ -451,6 +456,7 @@ typedef struct BevelModifierData {
/** Curve info for the custom profile */
struct CurveProfile *custom_profile;
+ void *_pad2;
} BevelModifierData;
/* BevelModifierData->flags and BevelModifierData->lim_flags */
@@ -535,6 +541,7 @@ typedef struct FluidModifierData {
float time;
/** Domain, inflow, outflow, .... */
int type;
+ void *_pad1;
} FluidModifierData;
/* Fluid modifier flags */
@@ -680,6 +687,7 @@ typedef struct CastModifierData {
/** MAX_VGROUP_NAME. */
char defgrp_name[64];
short flag, type;
+ void *_pad1;
} CastModifierData;
/* Cast modifier flags */
@@ -725,6 +733,7 @@ typedef struct WaveModifierData {
float timeoffs, lifetime;
char _pad1[4];
+ void *_pad2;
} WaveModifierData;
/* WaveModifierData.flag */
@@ -797,6 +806,7 @@ typedef struct HookModifierData {
float force;
/** Optional vertexgroup name, MAX_VGROUP_NAME. */
char name[64];
+ void *_pad1;
} HookModifierData;
typedef struct SoftbodyModifierData {
@@ -1001,6 +1011,7 @@ typedef struct ParticleSystemModifierData {
int totdmvert, totdmedge, totdmface;
short flag;
char _pad[2];
+ void *_pad1;
} ParticleSystemModifierData;
typedef enum {
@@ -1037,6 +1048,7 @@ typedef struct ParticleInstanceModifierData {
char index_layer_name[64];
/** MAX_CUSTOMDATA_LAYER_NAME. */
char value_layer_name[64];
+ void *_pad1;
} ParticleInstanceModifierData;
typedef enum {
@@ -1057,6 +1069,7 @@ typedef struct ExplodeModifierData {
float protect;
/** MAX_CUSTOMDATA_LAYER_NAME. */
char uvname[64];
+ void *_pad1;
} ExplodeModifierData;
typedef struct MultiresModifierData {
@@ -1086,6 +1099,7 @@ typedef struct FluidsimModifierData {
/** Definition is in DNA_object_fluidsim_types.h. */
struct FluidsimSettings *fss;
+ void *_pad1;
} FluidsimModifierData;
/* DEPRECATED, only used for versioning. */
@@ -1202,6 +1216,7 @@ typedef struct SimpleDeformModifierData {
char deform_axis;
char flag;
+ void *_pad1;
} SimpleDeformModifierData;
/* SimpleDeform->flag */
@@ -1310,6 +1325,7 @@ typedef struct ScrewModifierData {
short flag;
char axis;
char _pad[5];
+ void *_pad1;
} ScrewModifierData;
enum {
@@ -1434,6 +1450,7 @@ typedef struct WarpModifierData {
char flag;
char falloff_type;
char _pad[6];
+ void *_pad1;
} WarpModifierData;
/* WarpModifierData->flag */
@@ -1497,6 +1514,7 @@ typedef struct WeightVGEditModifierData {
/* Padding... */
char _pad0[4];
+ void *_pad1;
} WeightVGEditModifierData;
/* WeightVGEdit flags. */
@@ -2063,6 +2081,7 @@ typedef struct DataTransferModifierData {
char defgrp_name[64];
int flags;
+ void *_pad2;
} DataTransferModifierData;
/* DataTransferModifierData.flags */
@@ -2093,6 +2112,7 @@ typedef struct NormalEditModifierData {
float mix_limit;
float offset[3];
char _pad0[4];
+ void *_pad1;
} NormalEditModifierData;
/* NormalEditModifierData.mode */
@@ -2153,6 +2173,7 @@ typedef struct MeshSeqCacheModifierData {
float last_lookup_time;
int _pad1;
+ void *_pad2;
} MeshSeqCacheModifierData;
/* MeshSeqCacheModifierData.read_flag */
@@ -2198,6 +2219,7 @@ typedef struct SurfaceDeformModifierData {
float strength;
char _pad[4];
char defgrp_name[64];
+ void *_pad1;
} SurfaceDeformModifierData;
/* Surface Deform modifier flags */
@@ -2283,6 +2305,7 @@ typedef struct MeshToVolumeModifierData {
float density;
char _pad2[4];
+ void *_pad3;
} MeshToVolumeModifierData;
/* MeshToVolumeModifierData->resolution_mode */
@@ -2329,6 +2352,7 @@ typedef struct VolumeToMeshModifierData {
/** MAX_NAME */
char grid_name[64];
+ void *_pad1;
} VolumeToMeshModifierData;
/** VolumeToMeshModifierData->resolution_mode */
diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h
index aa1178fb139..a467f402c85 100644
--- a/source/blender/makesdna/DNA_object_types.h
+++ b/source/blender/makesdna/DNA_object_types.h
@@ -209,6 +209,7 @@ typedef struct Object_Runtime {
unsigned short local_collections_bits;
short _pad2[3];
+ void *_pad3;
} Object_Runtime;
typedef struct ObjectLineArt {
@@ -443,6 +444,7 @@ typedef struct Object {
ObjectLineArt lineart;
/** Runtime evaluation data (keep last). */
+ void *_pad9;
Object_Runtime runtime;
} Object;
More information about the Bf-blender-cvs
mailing list