[Bf-blender-cvs] [8ba4dd389b8] blender2.8: Fix gizmo tooltips ignoring preference

[Campbell Barton]

Commit: 8ba4dd389b8bb92047b197b3ab420e05728f6f73
Author: Campbell Barton
Date:   Wed Oct 3 08:20:07 2018 +1000
Branches: blender2.8
https://developer.blender.org/rB8ba4dd389b8bb92047b197b3ab420e05728f6f73

Fix gizmo tooltips ignoring preference

===================================================================

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 a51eb3a529c..467328fc053 100644
--- a/source/blender/windowmanager/intern/wm_event_system.c
+++ b/source/blender/windowmanager/intern/wm_event_system.c
@@ -2440,7 +2440,9 @@ static int wm_handlers_do_intern(bContext *C, wmEvent *event, ListBase *handlers
 					int part;
 					gz = wm_gizmomap_highlight_find(gzmap, C, event, &part);
 					if (wm_gizmomap_highlight_set(gzmap, C, gz, part) && gz != NULL) {
-						WM_tooltip_timer_init(C, CTX_wm_window(C), region, WM_gizmomap_tooltip_init);
+						if (U.flag & USER_TOOLTIPS) {
+							WM_tooltip_timer_init(C, CTX_wm_window(C), region, WM_gizmomap_tooltip_init);
+						}
 					}
 				}
 				else {