From a6218502240499423d29157d3ca3dcb916909b64 Mon Sep 17 00:00:00 2001 From: Ray Molenkamp Date: Wed, 13 Dec 2017 06:59:44 -0700 Subject: Fix T53550: E hotkey not working after the color-band picker commit Related to D2886, the color-band picker was lacking a poll function. --- .../blender/editors/interface/interface_eyedropper_colorband.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/source/blender/editors/interface/interface_eyedropper_colorband.c b/source/blender/editors/interface/interface_eyedropper_colorband.c index 85339ff0322..b13d552dbeb 100644 --- a/source/blender/editors/interface/interface_eyedropper_colorband.c +++ b/source/blender/editors/interface/interface_eyedropper_colorband.c @@ -289,6 +289,13 @@ static int eyedropper_colorband_exec(bContext *C, wmOperator *op) } } +static int eyedropper_colorband_poll(bContext *C) +{ + uiBut *but = UI_context_active_but_get(C); + return (but && but->type == UI_BTYPE_COLORBAND); +} + + void UI_OT_eyedropper_colorband(wmOperatorType *ot) { /* identifiers */ @@ -301,6 +308,7 @@ void UI_OT_eyedropper_colorband(wmOperatorType *ot) ot->modal = eyedropper_colorband_modal; ot->cancel = eyedropper_colorband_cancel; ot->exec = eyedropper_colorband_exec; + ot->poll = eyedropper_colorband_poll; /* flags */ ot->flag = OPTYPE_BLOCKING | OPTYPE_INTERNAL; @@ -320,6 +328,7 @@ void UI_OT_eyedropper_colorband_point(wmOperatorType *ot) ot->modal = eyedropper_colorband_point_modal; ot->cancel = eyedropper_colorband_cancel; ot->exec = eyedropper_colorband_exec; + ot->poll = eyedropper_colorband_poll; /* flags */ ot->flag = OPTYPE_BLOCKING | OPTYPE_INTERNAL; -- cgit v1.2.3