diff options
Diffstat (limited to 'source/blender/makesdna/DNA_userdef_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_userdef_types.h | 41 |
1 files changed, 32 insertions, 9 deletions
diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h index 63e7a90547e..d50c0055499 100644 --- a/source/blender/makesdna/DNA_userdef_types.h +++ b/source/blender/makesdna/DNA_userdef_types.h @@ -619,8 +619,12 @@ typedef struct UserDef_FileSpaceData { typedef struct UserDef_Experimental { char use_undo_legacy; + char use_new_particle_system; + char use_new_hair_type; + char use_cycles_debug; + char use_sculpt_vertex_colors; /** `makesdna` does not allow empty structs. */ - char _pad0[7]; + char _pad[3]; } UserDef_Experimental; #define USER_EXPERIMENTAL_TEST(userdef, member) \ @@ -633,12 +637,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]; @@ -657,9 +661,9 @@ typedef struct UserDef { char anim_player[1024]; int anim_player_preset; - /** Minimum spacing between gridlines in View2D grids. */ + /** Minimum spacing between grid-lines in View2D grids. */ short v2d_min_gridsize; - /** #eTimecodeStyles, style of timecode display. */ + /** #eTimecodeStyles, style of time-code display. */ short timecode_style; short versions; @@ -690,7 +694,7 @@ typedef struct UserDef { float ui_scale; /** Setting for UI line width. */ int ui_line_width; - /** Runtime, full DPI divided by pixelsize. */ + /** Runtime, full DPI divided by `pixelsize`. */ int dpi; /** Runtime, multiplier to scale UI elements based on DPI. */ float dpi_fac; @@ -700,7 +704,7 @@ typedef struct UserDef { /** Deprecated, for forward compatibility. */ int virtual_pixel; - /** Console scrollback limit. */ + /** Console scroll-back limit. */ int scrollback; /** Node insert offset (aka auto-offset) margin, but might be useful for later stuff as well. */ char node_margin; @@ -729,7 +733,7 @@ typedef struct UserDef { char _pad1[2]; int undomemory; float gpu_viewport_quality DNA_DEPRECATED; - short gp_manhattendist, gp_euclideandist, gp_eraser; + short gp_manhattandist, gp_euclideandist, gp_eraser; /** #eGP_UserdefSettings. */ short gp_settings; char _pad13[4]; @@ -876,7 +880,9 @@ typedef struct UserDef { char _pad5[2]; float collection_instance_empty_size; - char _pad10[4]; + char _pad10[3]; + + char statusbar_flag; /* eUserpref_StatusBar_Flag */ struct WalkNavigation walk_navigation; @@ -1075,6 +1081,14 @@ typedef enum eUserpref_APP_Flag { USER_APP_LOCK_UI_LAYOUT = (1 << 0), } eUserpref_APP_Flag; +/** #UserDef.statusbar_flag */ +typedef enum eUserpref_StatusBar_Flag { + STATUSBAR_SHOW_MEMORY = (1 << 0), + STATUSBAR_SHOW_VRAM = (1 << 1), + STATUSBAR_SHOW_STATS = (1 << 2), + STATUSBAR_SHOW_VERSION = (1 << 3), +} eUserpref_StatusBar_Flag; + /** * Auto-Keying mode. * #UserDef.autokey_mode @@ -1150,6 +1164,15 @@ typedef enum eDupli_ID_Flags { USER_DUP_HAIR = (1 << 14), USER_DUP_POINTCLOUD = (1 << 15), USER_DUP_VOLUME = (1 << 16), + + USER_DUP_OBDATA = (~0) & ((1 << 24) - 1), + + /* Those are not exposed as user preferences, only used internaly. */ + USER_DUP_OBJECT = (1 << 24), + /* USER_DUP_COLLECTION = (1 << 25), */ /* UNUSED, keep because we may implement. */ + + /* Duplicate (and hence make local) linked data. */ + USER_DUP_LINKED_ID = (1 << 30), } eDupli_ID_Flags; /** |