fix [#26756] "Release confirms" breaks marker functionality in Timeline
authorCampbell Barton <ideasman42@gmail.com>
Mon, 4 Apr 2011 07:42:08 +0000 (07:42 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 4 Apr 2011 07:42:08 +0000 (07:42 +0000)
source/blender/windowmanager/intern/wm_event_system.c

index 223f739ad7843ff1cdb182844ffc01ae3fb4c7e2..e3d2a738497be090f6bac42829f47434ea9f44b8 100644 (file)
@@ -2145,6 +2145,13 @@ int WM_modal_tweak_exit(wmEvent *evt, int tweak_event)
                                        return 1;
                        }
                }
                                        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
        }
        else {
                /* this is fine as long as not doing km-release, otherwise