[Bf-blender-cvs] [f83eba6] HMD_viewport: Merge branch 'master' into HMD_viewport

[Julian Eisel]

Commit: f83eba60110f5d6fb0efc4c22e607c3fe71b746c
Author: Julian Eisel
Date:   Sun Mar 27 14:09:22 2016 +0200
Branches: HMD_viewport
https://developer.blender.org/rBf83eba60110f5d6fb0efc4c22e607c3fe71b746c

Merge branch 'master' into HMD_viewport

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



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

diff --cc source/blender/editors/interface/interface_handlers.c
index 89f718b,8363582..29ee6c5
--- a/source/blender/editors/interface/interface_handlers.c
+++ b/source/blender/editors/interface/interface_handlers.c
@@@ -6983,11 -6982,11 +6982,11 @@@ static int ui_do_button(bContext *C, ui
  		{
  			if (event->alt)
  				ui_but_anim_remove_driver(C);
- 			else
+ 			else if (event->ctrl)
  				ui_but_anim_add_driver(C);
 -				
 +
  			ED_region_tag_redraw(data->region);
 -			
 +
  			return WM_UI_HANDLER_BREAK;
  		}
  		/* handle keyingsets */