diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-04-04 11:42:08 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-04-04 11:42:08 +0400 |
commit | 57d020f061a9f8bdd319f382657572b8feb8a38a (patch) | |
tree | cbb597f2a40d554a8963a265f3ed37fa58dd3ec5 /source | |
parent | 233d8594fc2d18f1598dbc407b82486d165471a4 (diff) |
fix [#26756] "Release confirms" breaks marker functionality in Timeline
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/windowmanager/intern/wm_event_system.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c index 223f739ad78..e3d2a738497 100644 --- a/source/blender/windowmanager/intern/wm_event_system.c +++ b/source/blender/windowmanager/intern/wm_event_system.c @@ -2145,6 +2145,13 @@ int WM_modal_tweak_exit(wmEvent *evt, int tweak_event) return 1; } } + else { + /* if the initial event wasn't a tweak event then + * ignore USER_RELEASECONFIRM setting: see [#26756] */ + if(ELEM3(tweak_event, EVT_TWEAK_L, EVT_TWEAK_M, EVT_TWEAK_R) == 0) { + return 1; + } + } } else { /* this is fine as long as not doing km-release, otherwise |