Fix T72200: Split Quad View Region Crash
ClosedPublic
Actions

Authored by Jeroen Bakker (jbakker) on Jan 14 2020, 12:24 PM.

Details

Reviewers

Campbell Barton (campbellbarton)
Julian Eisel (Severin)

Maniphest Tasks

T72200: Blender Window Split during the 3d viewport quad area view will crash blender

Commits

rB29ab2386c025: Fix T72200: Split Quad View Region Crash

Summary

When splitting a Quad View by dragging a corner an quad area can become
negative size because of a one pixel offset to calculate the start of
the area.

This patch solves this to make sure that there are no negative areas. By
adapting the ARegion.winrct.

Diff Detail

Repository

rB Blender

Branch

T72200 (branched from master)

Build Status

Buildable 6241
Build 6241: arc lint + arc unit

Event Timeline

Jeroen Bakker (jbakker) created this revision.Jan 14 2020, 12:24 PM

Harbormaster completed remote builds in B6240: Diff 20830.Jan 14 2020, 12:24 PM

The previous patch had 2 fixes. I cleaned up this patch to contain only one.

Harbormaster completed remote builds in B6241: Diff 20831.Jan 14 2020, 12:28 PM

Jeroen Bakker (jbakker) added reviewers: Campbell Barton (campbellbarton), Julian Eisel (Severin).Jan 14 2020, 12:29 PM

Julian Eisel (Severin) added inline comments.Jan 14 2020, 12:59 PM

source/blender/editors/screen/area.c

1442–1443

Nitpicking here :) :
While this fixes this specific issue, the fix will break when max values end up being negative. E.g. because we change the 1px offset to be subtracted rather than added.
So I'd prefer to properly sanitize the rectangle, making sure min values are less then or equal to max values.

We could add a BLI_rcti_sanitize(), but BLI_rcti_init() already has this logic.

So I'd propose this instead:

P1210 Potential/alternative fix for T72200

1	diff --git a/source/blender/editors/screen/area.c b/source/blender/editors/screen/area.c
2	index 98bee156090..eb49177cc08 100644
3	--- a/source/blender/editors/screen/area.c
4	+++ b/source/blender/editors/screen/area.c
5	@@ -1437,6 +1437,11 @@ static void region_rect_recursive(
6	BLI_rcti_init(remainder, 0, 0, 0, 0);
7	}
8
9	+ /* Fix any negative dimensions. This can happen when a quad split 3d view gets to small (see
10	+ * T72200). BLI_rcti_init() sanitizes, making sure min values are <= max values. */
11	+ BLI_rcti_init(
12	+ &ar->winrct, ar->winrct.xmin, ar->winrct.xmax, ar->winrct.ymin, ar->winrct.ymax);
13	+
14	quad++;
15	}
16	}