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:
authorMartijn Versteegh <blender@aaltjegron.nl>2022-11-13 02:59:39 +0300
committerMartijn Versteegh <blender@aaltjegron.nl>2022-11-13 02:59:43 +0300
commitea4275a9bd3928f3fe25575944e7e1f33d41d556 (patch)
treea9ca6332c49652794bd2fd3e6543d362e116f7d0
parentf14dd870a956b6d357b47600dcffd5bf092a6a5c (diff)
Fix alignment of DisplaceModifierData.
The start of DisplaceModifierData needs to have the exact same layout as MappingInfoModifierData because it gets cast to that.
-rw-r--r--source/blender/makesdna/DNA_modifier_types.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/makesdna/DNA_modifier_types.h b/source/blender/makesdna/DNA_modifier_types.h
index 5fca67321b1..735d0462488 100644
--- a/source/blender/makesdna/DNA_modifier_types.h
+++ b/source/blender/makesdna/DNA_modifier_types.h
@@ -560,6 +560,7 @@ typedef struct DisplaceModifierData {
char map_bone[64];
/** MAX_CUSTOMDATA_LAYER_NAME. */
char uvlayer_name[68];
+ char _pad1[4];
int uvlayer_tmp;
int texmapping;
/* end MappingInfoModifierData */
@@ -571,7 +572,7 @@ typedef struct DisplaceModifierData {
float midlevel;
int space;
short flag;
- char _pad2[2];
+ char _pad2[6];
} DisplaceModifierData;
/** #DisplaceModifierData.flag */