Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2019-06-25 14:34:21 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-06-25 15:55:49 +0300
commitd08312463b27651171be1c487633804f6ea98d65 (patch)
tree2add8bb9dd20df5cba03664fdb1917ec13b6a1eb /source/blender/makesdna
parentf472ac391c18486db1933afa95831adc98fce3d2 (diff)
Preferences: changes to navigation gizmo
- Add 'Navigation Buttons' preference, used for 2D views (previously this couldn't be disabled). - Add "Off" option for 3D view axis. - Support minimal axis with navigation buttons.
Diffstat (limited to 'source/blender/makesdna')
-rw-r--r--source/blender/makesdna/DNA_userdef_types.h12
1 files changed, 10 insertions, 2 deletions
diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h
index 3fbdbbb6afa..894dbc05c54 100644
--- a/source/blender/makesdna/DNA_userdef_types.h
+++ b/source/blender/makesdna/DNA_userdef_types.h
@@ -591,7 +591,8 @@ typedef struct UserDef {
short dbl_click_time;
char _pad0[2];
- short wheellinescroll;
+ char wheellinescroll;
+ char mini_axis_type;
/** #eUserpref_UI_Flag. */
int uiflag;
/** #eUserpref_UI_Flag2. */
@@ -891,6 +892,13 @@ typedef enum eViewNavigation_Method {
VIEW_NAVIGATION_FLY = 1,
} eViewNavigation_Method;
+/** #UserDef.uiflag */
+typedef enum eUserpref_MiniAxisType {
+ USER_MINI_AXIS_TYPE_GIZMO = 0,
+ USER_MINI_AXIS_TYPE_MINIMAL = 1,
+ USER_MINI_AXIS_TYPE_NONE = 2,
+} eUserpref_MiniAxisType;
+
/** #UserDef.flag */
typedef enum eWalkNavigation_Flag {
USER_WALK_GRAVITY = (1 << 0),
@@ -917,7 +925,7 @@ typedef enum eUserpref_UI_Flag {
USER_ORBIT_SELECTION = (1 << 14),
USER_DEPTH_NAVIGATE = (1 << 15),
USER_HIDE_DOT = (1 << 16),
- USER_SHOW_GIZMO_AXIS = (1 << 17),
+ USER_SHOW_GIZMO_NAVIGATE = (1 << 17),
USER_SHOW_VIEWPORTNAME = (1 << 18),
USER_CAM_LOCK_NO_PARENT = (1 << 19),
USER_ZOOM_TO_MOUSEPOS = (1 << 20),