[Bf-blender-cvs] [b0985b3] master: Fix T48595: UI glitch with driver menu re-opening

[Campbell Barton]

Commit: b0985b393ce0335ffbdf5a67bc7cd01d55323ad1
Author: Campbell Barton
Date:   Tue Jun 14 01:36:27 2016 +1000
Branches: master
https://developer.blender.org/rBb0985b393ce0335ffbdf5a67bc7cd01d55323ad1

Fix T48595: UI glitch with driver menu re-opening

Holding Ctrl-D would keep opening driver menus.

===================================================================

M	source/blender/editors/interface/interface_handlers.c

===================================================================

diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c
index ff4e11a..133487e 100644
--- a/source/blender/editors/interface/interface_handlers.c
+++ b/source/blender/editors/interface/interface_handlers.c
@@ -6981,13 +6981,15 @@ static int ui_do_button(bContext *C, uiBlock *block, uiBut *but, const wmEvent *
 		         !IS_EVENT_MOD(event, shift, oskey) &&
 		         (event->val == KM_PRESS))
 		{
-			if (event->alt)
-				ui_but_anim_remove_driver(C);
-			else if (event->ctrl)
-				ui_but_anim_add_driver(C);
-				
-			ED_region_tag_redraw(data->region);
-			
+			/* quick check to prevent this opening within the popup menu its self */
+			if (!ELEM(NULL, but->rnapoin.data, but->rnaprop)) {
+				if (event->alt)
+					ui_but_anim_remove_driver(C);
+				else if (event->ctrl)
+					ui_but_anim_add_driver(C);
+
+				ED_region_tag_redraw(data->region);
+			}
 			return WM_UI_HANDLER_BREAK;
 		}
 		/* handle keyingsets */