diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-11-18 22:14:20 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-11-18 22:27:17 +0300 |
commit | 074cd53c19311955031f88d2486ac475ba43f806 (patch) | |
tree | d83f1daaeb4e7a6aa6a6218a5d3009a6338ebaf6 /source/blender/makesdna | |
parent | 64920a8febde6df596fe7c8e62c570db2f29ab95 (diff) |
Keymap: move left click select to a preference
Diffstat (limited to 'source/blender/makesdna')
-rw-r--r-- | source/blender/makesdna/DNA_userdef_types.h | 4 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_windowmanager_types.h | 13 |
2 files changed, 7 insertions, 10 deletions
diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h index 79a3397b752..58beb729892 100644 --- a/source/blender/makesdna/DNA_userdef_types.h +++ b/source/blender/makesdna/DNA_userdef_types.h @@ -569,7 +569,7 @@ typedef struct UserDef { struct ListBase uifonts; struct ListBase uistyles; struct ListBase user_keymaps; - struct ListBase user_keyconfig_prefs; /* wmKeyConfigPrefType. */ + struct ListBase user_keyconfig_prefs; /* wmKeyConfigPref. */ struct ListBase addons; struct ListBase autoexec_paths; struct ListBase user_menus; /* bUserMenu */ @@ -700,7 +700,7 @@ typedef enum eUserPref_Flag { USER_TOOLTIPS = (1 << 11), USER_TWOBUTTONMOUSE = (1 << 12), USER_NONUMPAD = (1 << 13), - USER_LMOUSESELECT = (1 << 14), + USER_FLAG_DEPRECATED_14 = (1 << 14), /* cleared */ USER_FILECOMPRESS = (1 << 15), USER_SAVE_PREVIEWS = (1 << 16), USER_CUSTOM_RANGE = (1 << 17), diff --git a/source/blender/makesdna/DNA_windowmanager_types.h b/source/blender/makesdna/DNA_windowmanager_types.h index 88974750ffb..193c34e3d11 100644 --- a/source/blender/makesdna/DNA_windowmanager_types.h +++ b/source/blender/makesdna/DNA_windowmanager_types.h @@ -352,14 +352,14 @@ enum { * This is similar to addon-preferences, * however unlike add-ons key-config's aren't saved to disk. * - * #wmKeyConfigPrefType is written to DNA, + * #wmKeyConfigPref is written to DNA, * #wmKeyConfigPrefType_Runtime has the RNA type. */ -typedef struct wmKeyConfigPrefType { - struct wmKeyConfigPrefType *next, *prev; +typedef struct wmKeyConfigPref { + struct wmKeyConfigPref *next, *prev; char idname[64]; /* unique name */ IDProperty *prop; -} wmKeyConfigPrefType; +} wmKeyConfigPref; typedef struct wmKeyConfig { struct wmKeyConfig *next, *prev; @@ -370,10 +370,7 @@ typedef struct wmKeyConfig { ListBase keymaps; int actkeymap; short flag; - - /* Supports select mouse switching? */ - char has_select_mouse; /* may remove in favor of custom properties. */ - char _pad0; + char _pad0[2]; } wmKeyConfig; /* wmKeyConfig.flag */ |