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
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2019-04-29 06:47:11 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-04-29 06:47:11 +0300
commit8821757d0dd038de15ccec6df595b3496d120167 (patch)
treefe980893b0f442c1e8df2ded77568c13858e9e38
parentdc2ce40c9518ef8b57c39f18f93e2993c7cb3270 (diff)
Fix region action zone not working when hidden
Introduced in recent fix for T61554
-rw-r--r--source/blender/editors/screen/screen_ops.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c
index 8e7475ec511..7e6f1dd2e4f 100644
--- a/source/blender/editors/screen/screen_ops.c
+++ b/source/blender/editors/screen/screen_ops.c
@@ -728,7 +728,9 @@ static bool azone_clipped_rect_calc(const AZone *az, rcti *r_rect_clip)
const ARegion *ar = az->ar;
*r_rect_clip = az->rect;
if (az->type == AZONE_REGION) {
- if (ar->overlap && (ar->v2d.keeptot != V2D_KEEPTOT_STRICT)) {
+ if (ar->overlap && (ar->v2d.keeptot != V2D_KEEPTOT_STRICT) &&
+ /* Only when this isn't hidden (where it's displayed as an button that expands). */
+ ((az->ar->flag & (RGN_FLAG_HIDDEN | RGN_FLAG_TOO_SMALL)) == 0)) {
/* A floating region to be resized, clip by the visible region. */
switch (az->edge) {
case AE_TOP_TO_BOTTOMRIGHT: