Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilipp Oeser <info@graphics-engineer.com>2019-12-05 03:32:23 +0300
committerPhilipp Oeser <info@graphics-engineer.com>2020-01-29 13:09:14 +0300
commit9c062ac310a08909c42fa2be21b8093f492ba668 (patch)
treeb56d403c8e2d8347b1fb72c44d159fb0b5522dc6 /source/blender/editors/interface
parent8410aa268480791746183e1fc7a11c9a14881bb3 (diff)
Fix T72089: Image Editor - Paint mode, Clone Tool - disfunctional clear
button in the Image slot in the Brush panel Caused/exposed by rBaf9ca138ba7b Also relevant was rB828905190e12 Above commits moved the WM_UI_HANDLER_BREAK around so it would not be returned anymore. We need WM_UI_HANDLER_BREAK, otherwise we wont get through to to KM_RELEASE. There are two places that explicitly check for KM_RELEASE (call to `ui_do_but_extra_operator_icon` in both `ui_do_but_SEARCH_UNLINK` / `ui_do_button`), and without the above we only ever get here with KM_PRESS. This patch restores the behavior regarding WM_UI_HANDLER_BREAK to what is was before the two culprit commits. Checked that both this report (T72089) and T69755 are working. Maniphest Tasks: T72089 Differential Revision: https://developer.blender.org/D6363
Diffstat (limited to 'source/blender/editors/interface')
-rw-r--r--source/blender/editors/interface/interface_handlers.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c
index 41845943047..43d71ddd047 100644
--- a/source/blender/editors/interface/interface_handlers.c
+++ b/source/blender/editors/interface/interface_handlers.c
@@ -4360,8 +4360,10 @@ static int ui_do_but_TEX(
else if (but->dt == UI_EMBOSS_NONE && !event->ctrl) {
/* pass */
}
- else if (!ui_but_extra_operator_icon_mouse_over_get(but, data, event)) {
- button_activate_state(C, but, BUTTON_STATE_TEXT_EDITING);
+ else {
+ if (!ui_but_extra_operator_icon_mouse_over_get(but, data, event)) {
+ button_activate_state(C, but, BUTTON_STATE_TEXT_EDITING);
+ }
return WM_UI_HANDLER_BREAK;
}
}