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:
authorTon Roosendaal <ton@blender.org>2013-02-23 18:31:46 +0400
committerTon Roosendaal <ton@blender.org>2013-02-23 18:31:46 +0400
commit89e0de3c355e3d44640d3180599611cbb88a8835 (patch)
treeac5d865b80aab62776f649de4b3133c6f519d3d0 /source/blender/editors/screen/area.c
parent6a55cd889c4b439d8e0b4d6777babd5f7d46ed5a (diff)
Bug fix #34347
If you move (with F5) the properties and tools region in 3d viewport to the same side, the mini-axis and text overlays were drawing in wrong place.
Diffstat (limited to 'source/blender/editors/screen/area.c')
-rw-r--r--source/blender/editors/screen/area.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/source/blender/editors/screen/area.c b/source/blender/editors/screen/area.c
index 023a1bbbb1c..46f726e45c6 100644
--- a/source/blender/editors/screen/area.c
+++ b/source/blender/editors/screen/area.c
@@ -1965,11 +1965,13 @@ void ED_region_visible_rect(ARegion *ar, rcti *rect)
for (; arn; arn = arn->next) {
if (ar != arn && arn->overlap) {
if (BLI_rcti_isect(rect, &arn->winrct, NULL)) {
- /* overlap left */
- if (rect->xmin == arn->winrct.xmin)
+
+ /* overlap left, also check 1 pixel offset (2 regions on one side) */
+ if ( ABS(rect->xmin - arn->winrct.xmin) < 2)
rect->xmin = arn->winrct.xmax;
+
/* overlap right */
- if (rect->xmax == arn->winrct.xmax)
+ if ( ABS(rect->xmax - arn->winrct.xmax) < 2)
rect->xmax = arn->winrct.xmin;
}
}