diff options
author | Campbell Barton <ideasman42@gmail.com> | 2020-01-17 11:07:03 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2020-01-17 11:07:03 +0300 |
commit | 684b5172ff4dbbcad2d33a3b0fae7181bcbd00b6 (patch) | |
tree | e21648ac4467cfa067fea15ec6a944fa1e2ef736 /source/blender/windowmanager | |
parent | 74acb0068452ff9c7d42e52a594371123190bbf2 (diff) | |
parent | 6b7e5b35bcbfbd603573bff5761347d4bf0bda2a (diff) |
Merge branch 'blender-v2.82-release'
Diffstat (limited to 'source/blender/windowmanager')
-rw-r--r-- | source/blender/windowmanager/gizmo/intern/wm_gizmo_group.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/source/blender/windowmanager/gizmo/intern/wm_gizmo_group.c b/source/blender/windowmanager/gizmo/intern/wm_gizmo_group.c index 73bee883cf8..14657bfa6bd 100644 --- a/source/blender/windowmanager/gizmo/intern/wm_gizmo_group.c +++ b/source/blender/windowmanager/gizmo/intern/wm_gizmo_group.c @@ -33,6 +33,7 @@ #include "BLI_buffer.h" #include "BLI_listbase.h" +#include "BLI_rect.h" #include "BLI_string.h" #include "BKE_context.h" @@ -1154,7 +1155,10 @@ void WM_gizmo_group_refresh(const bContext *C, wmGizmoGroup *gzgroup) wmGizmo *gz = wm_gizmomap_highlight_get(gzmap); if (!gz || gz->parent_gzgroup != gzgroup) { wmWindow *win = CTX_wm_window(C); - if (win->tweak) { + ARegion *ar = CTX_wm_region(C); + BLI_assert(ar->gizmo_map == gzmap); + /* Check if the tweak event originated from this region. */ + if ((win->tweak != NULL) && BLI_rcti_compare(&ar->winrct, &win->tweak->winrct)) { /* We need to run refresh again. */ gzgroup->init_flag &= ~WM_GIZMOGROUP_INIT_REFRESH; WM_gizmomap_tag_refresh_drawstep(gzmap, WM_gizmomap_drawstep_from_gizmo_group(gzgroup)); |