diff options
| author | Bastien Montagne <bastien@blender.org> | 2020-06-16 18:37:58 +0300 |
|---|---|---|
| committer | Bastien Montagne <bastien@blender.org> | 2020-06-16 18:40:30 +0300 |
| commit | 16652185ce697f41bb3b67be520ccc35719309f1 (patch) | |
| tree | ad85c3da7926cc2478e44f62338a2e05de96ceed /source/blender/makesdna | |
| parent | 94fba47513239a2ea20722d7d68b19e7e69e6b26 (diff) | |
Fix (unreported) wrong size of UserPreferences' `dupflag` parameter.
Adding volume obdata option to `eDupli_ID_Flags` enum made it go beyond
the 16 bits of a short... Also, enums should typically be stored in
unsigned integers.
Diffstat (limited to 'source/blender/makesdna')
| -rw-r--r-- | source/blender/makesdna/DNA_userdef_types.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h index 63e7a90547e..4b6d78a1d14 100644 --- a/source/blender/makesdna/DNA_userdef_types.h +++ b/source/blender/makesdna/DNA_userdef_types.h @@ -633,12 +633,12 @@ typedef struct UserDef { /** #eUserPref_Flag. */ int flag; /** #eDupli_ID_Flags. */ - short dupflag; + unsigned int dupflag; /** #eUserPref_PrefFlag preferences for the preferences. */ char pref_flag; char savetime; char mouse_emulate_3_button_modifier; - char _pad4[3]; + char _pad4[1]; /** FILE_MAXDIR length. */ char tempdir[768]; char fontdir[768]; |