diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-03-09 08:47:31 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-03-09 08:47:31 +0300 |
| commit | b40a4f66b250ceafb8a9b8e6b644a8f1df802c1c (patch) | |
| tree | 90844a3f9fb41f38ac37a26783b506d138a5a5a9 /source/blender/makesdna/DNA_userdef_types.h | |
| parent | 696ed6d3caef5ad81c011d435fd02f82f6c231d3 (diff) | |
| parent | 4ab322fdd2e019ba337b2560a2d36f2175c03a32 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/makesdna/DNA_userdef_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_userdef_types.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h index 1dc6c7ab578..07d1316183b 100644 --- a/source/blender/makesdna/DNA_userdef_types.h +++ b/source/blender/makesdna/DNA_userdef_types.h @@ -498,7 +498,6 @@ typedef struct UserDef { int prefetchframes; float pad_rot_angle; /* control the rotation step of the view when PAD2, PAD4, PAD6&PAD8 is use */ short frameserverport; - short pad4; short obcenter_dia; short rvisize; /* rotating view icon size */ short rvibright; /* rotating view icon brightness */ @@ -510,6 +509,8 @@ typedef struct UserDef { char ipo_new; /* interpolation mode for newly added F-Curves */ char keyhandles_new; /* handle types for newly added keyframes */ char gpu_select_method; + char gpu_select_pick_deph; + char pad4; char view_frame_type; int view_frame_keyframes; /* number of keyframes to zoom around current frame */ |