[Bf-blender-cvs] [9e6c4be731a] blender-v2.93-release: Fix T88167: Regression: no tooltip for syringe/picker, during picking object
Pratik Borhade
noreply at git.blender.org
Wed May 19 13:48:08 CEST 2021
Commit: 9e6c4be731a594593cb7cba96f33ed2d17d71b7f
Author: Pratik Borhade
Date: Wed May 19 13:46:55 2021 +0200
Branches: blender-v2.93-release
https://developer.blender.org/rB9e6c4be731a594593cb7cba96f33ed2d17d71b7f
Fix T88167: Regression: no tooltip for syringe/picker, during picking object
Fix T88167.
Caused by {rB97defd9cd79b6e3ed0e52481a7078107dbe0522b}
`(BLI_rcti_isect_pt` used here to confirm if cursor position is in between active region boundary.
Subtracting min region boundary from the mouse position before the check, fails the condition.
`mval[2]` introduced to hold the region relative mouse position.
Reviewed By: Severin
Maniphest Tasks: T88167
Differential Revision: https://developer.blender.org/D11224
===================================================================
M source/blender/editors/interface/interface_eyedropper.c
===================================================================
diff --git a/source/blender/editors/interface/interface_eyedropper.c b/source/blender/editors/interface/interface_eyedropper.c
index 178f663ff58..e4f502950ab 100644
--- a/source/blender/editors/interface/interface_eyedropper.c
+++ b/source/blender/editors/interface/interface_eyedropper.c
@@ -130,14 +130,19 @@ void eyedropper_draw_cursor_text_region(const struct bContext *C,
const char *name)
{
wmWindow *win = CTX_wm_window(C);
- const int x = win->eventstate->x - region->winrct.xmin;
- const int y = win->eventstate->y - region->winrct.ymin;
+ const int x = win->eventstate->x;
+ const int y = win->eventstate->y;
if ((name[0] == '\0') || (BLI_rcti_isect_pt(®ion->winrct, x, y) == false)) {
return;
}
- eyedropper_draw_cursor_text_ex(x, y, name);
+ const int mval[2] = {
+ x - region->winrct.xmin,
+ y - region->winrct.ymin,
+ };
+
+ eyedropper_draw_cursor_text_ex(mval[0], mval[1], name);
}
/**
More information about the Bf-blender-cvs
mailing list