Commit: dceaef92d7a41fe5835084b7feb9fcecadf111ce
Author: Bastien Montagne
Date: Tue Jun 16 17:37:58 2020 +0200
Branches: blender-v2.83-release
https://developer.blender.org/rBdceaef92d7a41fe5835084b7feb9fcecadf111ce
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.
===================================================================
M source/blender/makesdna/DNA_userdef_types.h
===================================================================
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];
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
