[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60610] trunk/blender/source/blender/ editors/interface/interface_handlers.c: e-key to access the eyedropper over a color button.

Campbell Barton ideasman42 at gmail.com
Tue Oct 8 15:58:29 CEST 2013


Revision: 60610
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60610
Author:   campbellbarton
Date:     2013-10-08 13:58:28 +0000 (Tue, 08 Oct 2013)
Log Message:
-----------
e-key to access the eyedropper over a color button.

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-10-08 13:49:42 UTC (rev 60609)
+++ trunk/blender/source/blender/editors/interface/interface_handlers.c	2013-10-08 13:58:28 UTC (rev 60610)
@@ -5405,6 +5405,18 @@
 		else if (event->type == EVT_DROP) {
 			ui_but_drop(C, event, but, data);
 		}
+		/* handle eyedropper */
+		else if ((event->type == EKEY) && (event->val == KM_PRESS)) {
+			if (event->alt || event->shift || event->ctrl || event->oskey) {
+				/* pass */
+			}
+			else {
+				if (but->type == COLOR) {
+					WM_operator_name_call(C, "UI_OT_eyedropper_color", WM_OP_INVOKE_DEFAULT, NULL);
+					return WM_UI_HANDLER_BREAK;
+				}
+			}
+		}
 		/* handle keyframing */
 		else if ((event->type == IKEY) &&
 		         !ELEM(KM_MOD_FIRST, event->ctrl, event->oskey) &&




More information about the Bf-blender-cvs mailing list