[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58583] trunk/blender/source/blender/ editors/interface/interface_handlers.c: fix/workaround [#36269] Crash upon right click on menu and left click on item
Campbell Barton
ideasman42 at gmail.com
Wed Jul 24 22:53:24 CEST 2013
Revision: 58583
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58583
Author: campbellbarton
Date: 2013-07-24 20:53:24 +0000 (Wed, 24 Jul 2013)
Log Message:
-----------
fix/workaround [#36269] Crash upon right click on menu and left click on item
Modified Paths:
--------------
trunk/blender/source/blender/editors/interface/interface_handlers.c
Modified: trunk/blender/source/blender/editors/interface/interface_handlers.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_handlers.c 2013-07-24 20:50:30 UTC (rev 58582)
+++ trunk/blender/source/blender/editors/interface/interface_handlers.c 2013-07-24 20:53:24 UTC (rev 58583)
@@ -6617,6 +6617,23 @@
BLI_assert(block->flag & UI_BLOCK_MOVEMOUSE_QUIT);
+
+ /* annoying fix for [#36269], this is a bit odd but in fact works quite well
+ * don't mouse-out of a menu if another menu has been created after it.
+ * if this causes problems we could remove it and check on a different fix - campbell */
+ if (menu->region->next) {
+ /* am I the last menu (test) */
+ ARegion *ar = menu->region->next;
+ do {
+ uiBlock *block = ar->uiblocks.first;
+ if (block && ui_block_is_menu(block)) {
+ return true;
+ }
+ } while ((ar = ar->next));
+ }
+ /* annoying fix end! */
+
+
if (!menu->dotowards) {
return false;
}
More information about the Bf-blender-cvs
mailing list