Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2019-04-02 16:56:16 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2019-04-02 17:00:52 +0300
commit4f4cea727efdeaf388de7ce84a6a6c399050c590 (patch)
tree005f1e06f339a9c27f9e568906812304a5af679e /source/blender
parentb0037cd0b4a76596ddfa34b21c1618f68cbb79bd (diff)
Fix T63164: DNA size mismatches on 32bit, causing memory corruption and crashes.
Some alignment rules from Visual Studion on 32 bit are not taken into account, this fixes the structs to confirm. We now have static asserts to catch when such breakage happens in the future.
Diffstat (limited to 'source/blender')
-rw-r--r--source/blender/makesdna/DNA_gpencil_types.h1
-rw-r--r--source/blender/makesdna/DNA_mesh_types.h1
-rw-r--r--source/blender/makesdna/DNA_object_types.h1
3 files changed, 3 insertions, 0 deletions
diff --git a/source/blender/makesdna/DNA_gpencil_types.h b/source/blender/makesdna/DNA_gpencil_types.h
index bd17d4e57dc..56e17fe9149 100644
--- a/source/blender/makesdna/DNA_gpencil_types.h
+++ b/source/blender/makesdna/DNA_gpencil_types.h
@@ -201,6 +201,7 @@ typedef struct bGPDstroke {
/** Vertex weight data. */
struct MDeformVert *dvert;
+ void *_pad3;
bGPDstroke_Runtime runtime;
char _pad2[4];
diff --git a/source/blender/makesdna/DNA_mesh_types.h b/source/blender/makesdna/DNA_mesh_types.h
index 15b95104359..0d43b14e252 100644
--- a/source/blender/makesdna/DNA_mesh_types.h
+++ b/source/blender/makesdna/DNA_mesh_types.h
@@ -189,6 +189,7 @@ typedef struct Mesh {
/** Deprecated multiresolution modeling data, only keep for loading old files. */
struct Multires *mr DNA_DEPRECATED;
+ void *_pad1;
Mesh_Runtime runtime;
} Mesh;
diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h
index e97ae722457..9f2118d9cc0 100644
--- a/source/blender/makesdna/DNA_object_types.h
+++ b/source/blender/makesdna/DNA_object_types.h
@@ -170,6 +170,7 @@ typedef struct Object_Runtime {
struct ObjectBBoneDeform *cached_bbone_deformation;
+ void *_pad1;
} Object_Runtime;
typedef struct Object {