[Bf-blender-cvs] [03e5ba31837] blender2.8: Fix hidden action-zone interaction
Campbell Barton
noreply at git.blender.org
Wed Nov 7 08:23:57 CET 2018
Commit: 03e5ba31837cbe91b633e18f19ba0b08e070e0dc
Author: Campbell Barton
Date: Wed Nov 7 18:13:15 2018 +1100
Branches: blender2.8
https://developer.blender.org/rB03e5ba31837cbe91b633e18f19ba0b08e070e0dc
Fix hidden action-zone interaction
===================================================================
M source/blender/editors/screen/screen_ops.c
===================================================================
diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c
index 8c28d73f44b..41e5ca6b611 100644
--- a/source/blender/editors/screen/screen_ops.c
+++ b/source/blender/editors/screen/screen_ops.c
@@ -684,6 +684,13 @@ static AZone *area_actionzone_refresh_xy(ScrArea *sa, const int xy[2], const boo
AZone *az = NULL;
for (az = sa->actionzones.first; az; az = az->next) {
+ if (az->ar) {
+ if (az->ar->flag & (RGN_FLAG_HIDDEN | RGN_FLAG_TOO_SMALL)) {
+ continue;
+ }
+ BLI_assert(az->ar->visible);
+ }
+
if (BLI_rcti_isect_pt_v(&az->rect, xy)) {
if (az->type == AZONE_AREA) {
/* no triangle intersect but a hotspot circle based on corner */
More information about the Bf-blender-cvs
mailing list