Commit: c68c32a409526a66c99e6762a492c2d7a3caf9b4
Author: Lukas Tönne
Date: Tue Sep 30 18:37:42 2014 +0200
Branches: master
https://developer.blender.org/rBc68c32a409526a66c99e6762a492c2d7a3caf9b4
Fix for duplicate member in UserDef from own commit (merge mistake).
===================================================================
M source/blender/makesdna/DNA_userdef_types.h
===================================================================
diff --git a/source/blender/makesdna/DNA_userdef_types.h
b/source/blender/makesdna/DNA_userdef_types.h
index d33e3be..382fd8c 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 */
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
