[Bf-blender-cvs] [ea4275a9bd3] refactor-mesh-uv-map-generic: Fix alignment of DisplaceModifierData.
Martijn Versteegh
noreply at git.blender.org
Sun Nov 13 01:01:04 CET 2022
Commit: ea4275a9bd3928f3fe25575944e7e1f33d41d556
Author: Martijn Versteegh
Date: Sun Nov 13 00:59:39 2022 +0100
Branches: refactor-mesh-uv-map-generic
https://developer.blender.org/rBea4275a9bd3928f3fe25575944e7e1f33d41d556
Fix alignment of DisplaceModifierData.
The start of DisplaceModifierData needs to have the exact same layout
as MappingInfoModifierData because it gets cast to that.
===================================================================
M source/blender/makesdna/DNA_modifier_types.h
===================================================================
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 */
More information about the Bf-blender-cvs
mailing list