[Bf-blender-cvs] [aa0cd21da03] master: Fix T65727: Broken button tool-tips in 3D view
Campbell Barton
noreply at git.blender.org
Wed Jun 12 04:59:13 CEST 2019
Commit: aa0cd21da03421b8757cc743ea595783849d87ef
Author: Campbell Barton
Date: Wed Jun 12 12:57:20 2019 +1000
Branches: master
https://developer.blender.org/rBaa0cd21da03421b8757cc743ea595783849d87ef
Fix T65727: Broken button tool-tips in 3D view
Own error in 686820289982.
===================================================================
M source/blender/windowmanager/intern/wm_event_system.c
===================================================================
diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c
index 18b6397844d..005e05c4003 100644
--- a/source/blender/windowmanager/intern/wm_event_system.c
+++ b/source/blender/windowmanager/intern/wm_event_system.c
@@ -2794,8 +2794,11 @@ static int wm_handlers_do_intern(bContext *C, wmEvent *event, ListBase *handlers
int part = -1;
gz = wm_gizmomap_highlight_find(gzmap, C, event, &part);
- if ((gz == NULL) || (prev.gz != gz) || (prev.part != part)) {
- WM_tooltip_clear(C, CTX_wm_window(C));
+ /* If no gizmos are/were active, don't clear tool-tips. */
+ if (gz || prev.gz) {
+ if ((prev.gz != gz) || (prev.part != part)) {
+ WM_tooltip_clear(C, CTX_wm_window(C));
+ }
}
if (wm_gizmomap_highlight_set(gzmap, C, gz, part)) {
More information about the Bf-blender-cvs
mailing list