diff options
| author | Philipp Oeser <info@graphics-engineer.com> | 2020-01-29 13:19:20 +0300 |
|---|---|---|
| committer | Philipp Oeser <info@graphics-engineer.com> | 2020-01-29 13:19:20 +0300 |
| commit | 3ee219b8452c0820c8fe1c1fae067397e1da9676 (patch) | |
| tree | 10fcbc5299ec43e998e74f783e7f7d233a19062b /source/blender/editors/interface | |
| parent | 34853c7e06c98fb26c2a5969317f340b6551005a (diff) | |
| parent | 9c062ac310a08909c42fa2be21b8093f492ba668 (diff) | |
Merge branch 'blender-v2.82-release'
Diffstat (limited to 'source/blender/editors/interface')
| -rw-r--r-- | source/blender/editors/interface/interface_handlers.c | 6 |
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 cdaa5b26b8a..c6c19e8d66c 100644 --- a/source/blender/editors/interface/interface_handlers.c +++ b/source/blender/editors/interface/interface_handlers.c @@ -4371,8 +4371,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; } } |