Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix for duplicate member in UserDef from own commit (merge mistake).

Browse Source
This commit is contained in:
Lukas Tönne
2014-09-30 18:37:42 +02:00
parent 6fa46ad315
commit c68c32a409
1 changed files with 0 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/makesdna/DNA_userdef_types.h
View File

@@ -535,14 +535,12 @@ typedef struct UserDef {
float fcu_inactive_alpha; /* opacity of inactive F-Curves in F-Curve Editor */ float fcu_inactive_alpha; /* opacity of inactive F-Curves in F-Curve Editor */
float pixelsize; /* private, set by GHOST, to multiply DPI with */ float pixelsize; /* private, set by GHOST, to multiply DPI with */
int virtual_pixel; /* virtual pixelsize mode */ 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 short pie_interaction_type; /* if keeping a pie menu spawn button pressed after this time, it turns into
* a drag/release pie menu */ * a drag/release pie menu */
short pie_initial_timeout; /* direction in the pie menu will always be calculated from the initial position short pie_initial_timeout; /* direction in the pie menu will always be calculated from the initial position
* within this time limit */ * within this time limit */
int pie_animation_timeout; int pie_animation_timeout;
int pad2;
short pie_menu_radius; /* pie menu radius */ short pie_menu_radius; /* pie menu radius */
short pie_menu_threshold; /* pie menu distance from center before a direction is set */ short pie_menu_threshold; /* pie menu distance from center before a direction is set */