[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54789] trunk/blender/source/blender/ editors/screen/area.c: Bug fix #34347

Ton Roosendaal ton at blender.org
Sat Feb 23 15:31:47 CET 2013


Revision: 54789
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54789
Author:   ton
Date:     2013-02-23 14:31:46 +0000 (Sat, 23 Feb 2013)
Log Message:
-----------
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.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/screen/area.c

Modified: trunk/blender/source/blender/editors/screen/area.c
===================================================================
--- trunk/blender/source/blender/editors/screen/area.c	2013-02-23 12:55:19 UTC (rev 54788)
+++ trunk/blender/source/blender/editors/screen/area.c	2013-02-23 14:31:46 UTC (rev 54789)
@@ -1965,11 +1965,13 @@
 	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;
 			}
 		}




More information about the Bf-blender-cvs mailing list