Revision: 35991
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35991
Author: campbellbarton
Date: 2011-04-04 07:42:08 +0000 (Mon, 04 Apr 2011)
Log Message:
-----------
fix [#26756] "Release confirms" breaks marker functionality in Timeline
Modified Paths:
--------------
trunk/blender/source/blender/windowmanager/intern/wm_event_system.c
Modified: trunk/blender/source/blender/windowmanager/intern/wm_event_system.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_event_system.c
2011-04-04 05:47:04 UTC (rev 35990)
+++ trunk/blender/source/blender/windowmanager/intern/wm_event_system.c
2011-04-04 07:42:08 UTC (rev 35991)
@@ -2145,6 +2145,13 @@
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
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
