diff options
| author | Bastien Montagne <bastien@blender.org> | 2020-06-16 18:37:58 +0300 |
|---|---|---|
| committer | Jeroen Bakker <jeroen@blender.org> | 2020-06-25 11:07:26 +0300 |
| commit | dceaef92d7a41fe5835084b7feb9fcecadf111ce (patch) | |
| tree | b6e8c878f0ae76ef26630dc2e4265e2fca97644d | |
| parent | 465d5c018ee0267cfff8648599a4ad543ab216a7 (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.
| -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 87a311bd336..3fd6b88e136 100644 --- a/source/blender/makesdna/DNA_userdef_types.h +++ b/source/blender/makesdna/DNA_userdef_types.h @@ -636,12 +636,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]; |