diff options
| author | Hans Goudey <h.goudey@me.com> | 2020-08-12 21:19:05 +0300 |
|---|---|---|
| committer | Hans Goudey <h.goudey@me.com> | 2020-08-12 21:19:05 +0300 |
| commit | 31705201dddebf7e3be5c4533b89f380aad1ede1 (patch) | |
| tree | 53c8be86b15e9ebd96dd60cad52e6acac8ce2324 /source/blender/makesdna/DNA_userdef_types.h | |
| parent | ea4c327c977223922c41c889fa2bd51403409dca (diff) | |
| parent | 337b6d075880ea44ff5183804a387dc98673ffb9 (diff) | |
Merge branch 'master' into active-fcurve-keyframe
Diffstat (limited to 'source/blender/makesdna/DNA_userdef_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_userdef_types.h | 27 |
1 files changed, 17 insertions, 10 deletions
diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h index 03193f540aa..e66a3233dd0 100644 --- a/source/blender/makesdna/DNA_userdef_types.h +++ b/source/blender/makesdna/DNA_userdef_types.h @@ -21,8 +21,7 @@ * \ingroup DNA */ -#ifndef __DNA_USERDEF_TYPES_H__ -#define __DNA_USERDEF_TYPES_H__ +#pragma once #include "DNA_listBase.h" #include "DNA_texture_types.h" /* ColorBand */ @@ -662,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; @@ -695,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; @@ -705,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; @@ -734,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]; @@ -881,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; @@ -1080,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 @@ -1330,5 +1339,3 @@ enum { #ifdef __cplusplus } #endif - -#endif |