[Bf-blender-cvs] [30ed837473a] blender2.8: Revert "Fix hidden action-zone interaction"

Campbell Barton noreply at git.blender.org
Mon Nov 12 04:31:59 CET 2018


Commit: 30ed837473aae1c418b7cd08d1041acdec282e09
Author: Campbell Barton
Date:   Mon Nov 12 14:31:28 2018 +1100
Branches: blender2.8
https://developer.blender.org/rB30ed837473aae1c418b7cd08d1041acdec282e09

Revert "Fix hidden action-zone interaction"

This reverts commit 03e5ba31837cbe91b633e18f19ba0b08e070e0dc.

Causes T57729, will look into an alternative fix.

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

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 9c7e18b0889..6a9f1e13aea 100644
--- a/source/blender/editors/screen/screen_ops.c
+++ b/source/blender/editors/screen/screen_ops.c
@@ -685,13 +685,6 @@ 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