Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2018-11-07 10:13:15 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-11-07 10:20:15 +0300
commit03e5ba31837cbe91b633e18f19ba0b08e070e0dc (patch)
tree7d9c7747f1038f8a906fb90046d55775cb41daa1 /source
parent484faaea4f314d4c598b77d56cf7fe5a167afcc0 (diff)
Fix hidden action-zone interaction
Diffstat (limited to 'source')
-rw-r--r--source/blender/editors/screen/screen_ops.c7
1 files changed, 7 insertions, 0 deletions
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 */