diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-06-21 14:52:23 +0400 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-06-21 14:52:23 +0400 |
commit | ff998e15a75a1f38db1e3fc91f7f0ef6664e4e45 (patch) | |
tree | 5540573fa941b7be67b701ccb9956cc90a7eb801 /source/blender/makesdna/DNA_object_types.h | |
parent | c250ab893c0b0086011d44848b66e53adcff8cad (diff) |
Fixes for 8vytes scalar types used in DNA (int64 and double)
- makesdna wasn't checking whether such scalars are aligned to 8 bytes.
Now it should be handled correct.
- Some scalars in Object structure weren't 8 bytes aligned, which lead
to some incorrectly loaded files.
Fixed by adding void *pad. It's a bit tricky part of patch, but can't
see clearer way to make alignment correct
Usually ints/chars were used for padding, but in this case there are
some leading pointer properties before int64 properties and using
pointer as a padding resolves alignment on both 32 and 64 bit
platforms.
Using pointers as padding weren't needed before, because all types
were correctly aligned independent of whether pointers are 4 or 8
bytes.
This fixes #31774: Empty offset Y parameter is resetting
Diffstat (limited to 'source/blender/makesdna/DNA_object_types.h')
-rw-r--r-- | source/blender/makesdna/DNA_object_types.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h index 83bfec3cc52..2e774e4ea84 100644 --- a/source/blender/makesdna/DNA_object_types.h +++ b/source/blender/makesdna/DNA_object_types.h @@ -258,6 +258,7 @@ typedef struct Object { struct FluidsimSettings *fluidsimSettings; /* if fluidsim enabled, store additional settings */ struct DerivedMesh *derivedDeform, *derivedFinal; + int *pad; uint64_t lastDataMask; /* the custom data layer mask that was last used to calculate derivedDeform and derivedFinal */ uint64_t customdata_mask; /* (extra) custom data layer mask to use for creating derivedmesh, set by depsgraph */ unsigned int state; /* bit masks of game controllers that are active */ |