diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2017-08-10 16:57:59 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2017-08-10 16:57:59 +0300 |
| commit | 4a4c6da0f8aaf94dff8d219770404c46760cce15 (patch) | |
| tree | ca7213d9957a1ce0ee4811e0deadfde2e42e18e9 /source/blender/makesdna | |
| parent | 6e2f17ea02be5caa9eee8a68ccd558474030b29a (diff) | |
| parent | aa1b35bb60d1d559f00095ed895a0c1884193a39 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/makesdna')
| -rw-r--r-- | source/blender/makesdna/DNA_userdef_types.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h index 63b287382b4..ab3fe1b51b9 100644 --- a/source/blender/makesdna/DNA_userdef_types.h +++ b/source/blender/makesdna/DNA_userdef_types.h @@ -481,7 +481,7 @@ typedef struct UserDef { int scrollback; /* console scrollback limit */ int dpi; /* range 48-128? */ float ui_scale; /* interface scale */ - int pad1; + int ui_line_width; /* interface line width */ char node_margin; /* node insert offset (aka auto-offset) margin, but might be useful for later stuff as well */ char pad2; short transopts; /* eUserpref_Translation_Flags */ |