diff options
| author | Lukas Tönne <lukas.toenne@gmail.com> | 2014-09-30 20:37:42 +0400 |
|---|---|---|
| committer | Lukas Tönne <lukas.toenne@gmail.com> | 2014-09-30 20:37:42 +0400 |
| commit | c68c32a409526a66c99e6762a492c2d7a3caf9b4 (patch) | |
| tree | d142db7775e790ac02955f71ebd1f65b62c6a311 /source | |
| parent | 6fa46ad315ceb46dbf47d6c6ffdda032d0e885ed (diff) | |
Fix for duplicate member in UserDef from own commit (merge mistake).
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/makesdna/DNA_userdef_types.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h index d33e3be9a6f..382fd8c1dbd 100644 --- a/source/blender/makesdna/DNA_userdef_types.h +++ b/source/blender/makesdna/DNA_userdef_types.h @@ -535,14 +535,12 @@ typedef struct UserDef { float fcu_inactive_alpha; /* opacity of inactive F-Curves in F-Curve Editor */ float pixelsize; /* private, set by GHOST, to multiply DPI with */ int virtual_pixel; /* virtual pixelsize mode */ - int pad2; short pie_interaction_type; /* if keeping a pie menu spawn button pressed after this time, it turns into * a drag/release pie menu */ short pie_initial_timeout; /* direction in the pie menu will always be calculated from the initial position * within this time limit */ int pie_animation_timeout; - int pad2; short pie_menu_radius; /* pie menu radius */ short pie_menu_threshold; /* pie menu distance from center before a direction is set */ |