diff options
author | Julian Eisel <eiseljulian@gmail.com> | 2015-04-07 15:08:30 +0300 |
---|---|---|
committer | Julian Eisel <eiseljulian@gmail.com> | 2015-04-07 15:13:20 +0300 |
commit | cc78664d50c6ae82d139552283ede467b0cf28cc (patch) | |
tree | 96575149c8b9fef5e8e8a3883d55f4e385deda74 /source/blender/makesdna | |
parent | d60ff6c112b1c5d3819676109b0080a316850eb0 (diff) |
Revert Sticky Keys (and everything related to that)
Our current keymap doesn't give us enough room to make such changes in
the event system. To fix small issues caused by this, we would need to do
drastic changes in Blender's keymaps and internal handling. It was worth
a try, but it didn't work.
I can write down a more descriptive statement in a few days, but for now
I need a break of this stuff.
Diffstat (limited to 'source/blender/makesdna')
-rw-r--r-- | source/blender/makesdna/DNA_userdef_types.h | 7 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_windowmanager_types.h | 3 |
2 files changed, 3 insertions, 7 deletions
diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h index 348e895e0a9..afa1f03a8ca 100644 --- a/source/blender/makesdna/DNA_userdef_types.h +++ b/source/blender/makesdna/DNA_userdef_types.h @@ -447,9 +447,7 @@ typedef struct UserDef { short versions; short dbl_click_time; - short click_timeout; - short pad3; - + short gameflags; short wheellinescroll; int uiflag, uiflag2; @@ -467,8 +465,7 @@ typedef struct UserDef { char pad2[2]; short transopts; short menuthreshold1, menuthreshold2; - int pad4; - + struct ListBase themes; struct ListBase uifonts; struct ListBase uistyles; diff --git a/source/blender/makesdna/DNA_windowmanager_types.h b/source/blender/makesdna/DNA_windowmanager_types.h index dca2faf0d54..6eb2f2487b0 100644 --- a/source/blender/makesdna/DNA_windowmanager_types.h +++ b/source/blender/makesdna/DNA_windowmanager_types.h @@ -253,8 +253,7 @@ typedef struct wmKeyMapItem { /* event */ short type; /* event code itself */ - short val; /* NOTE: other than event->val this can be the value itself - * (KM_ANY, KM_PRESS, etc) AND the clicktype (KM_DBL_CLICK, KM_HOLD, etc) */ + short val; /* KM_ANY, KM_PRESS, KM_NOTHING etc */ short shift, ctrl, alt, oskey; /* oskey is apple or windowskey, value denotes order of pressed */ short keymodifier; /* rawkey modifier */ |