Commit: f220d46679e79660bf6cc9c4423f0abc2763ba03
Author: Dalai Felinto
Date: Mon Aug 11 19:30:44 2014 +0200
Branches: multiview
https://developer.blender.org/rBf220d46679e79660bf6cc9c4423f0abc2763ba03
Merge remote-tracking branch 'origin/master' into multiview
===================================================================
===================================================================
diff --cc source/blender/makesdna/DNA_userdef_types.h
index 8565412,d1f5cc1..4a31fea
--- a/source/blender/makesdna/DNA_userdef_types.h
+++ b/source/blender/makesdna/DNA_userdef_types.h
@@@ -543,8 -534,16 +543,17 @@@ 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 */
+ 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 */
+
struct WalkNavigation walk_navigation;
+ struct StereoDisplay stereo_display;
} UserDef;
extern UserDef U; /* from blenkernel blender.c */
diff --cc source/blender/windowmanager/intern/wm_operators.c
index 896e558,d71beed..da09edb
--- a/source/blender/windowmanager/intern/wm_operators.c
+++ b/source/blender/windowmanager/intern/wm_operators.c
@@@ -4454,8 -4462,8 +4489,9 @@@ void wm_operatortype_init(void
WM_operatortype_append(WM_OT_splash);
WM_operatortype_append(WM_OT_search_menu);
WM_operatortype_append(WM_OT_call_menu);
+ WM_operatortype_append(WM_OT_call_menu_pie);
WM_operatortype_append(WM_OT_radial_control);
+ WM_operatortype_append(WM_OT_stereo_toggle);
#if defined(WIN32)
WM_operatortype_append(WM_OT_console_toggle);
#endif
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
