[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [17820] branches/blender2.5/blender/source /blender/editors/interface/view2d.c: 2.5

[Ton Roosendaal]

Revision: 17820
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17820
Author:   ton
Date:     2008-12-13 12:34:03 +0100 (Sat, 13 Dec 2008)

Log Message:
-----------
2.5

Bugfix in the "map cur with mask to region". Division had to be switched. :)

Modified Paths:
--------------
    branches/blender2.5/blender/source/blender/editors/interface/view2d.c

Modified: branches/blender2.5/blender/source/blender/editors/interface/view2d.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/interface/view2d.c	2008-12-13 09:25:47 UTC (rev 17819)
+++ branches/blender2.5/blender/source/blender/editors/interface/view2d.c	2008-12-13 11:34:03 UTC (rev 17820)
@@ -502,12 +502,9 @@
 {
 	*curmasked= v2d->cur;
 	
-	/* currently, the following 'hack' is only necessary for Outliner, and will cause
-	 * errors in all other views...
-	 */
-	if ((v2d->scroll) && (v2d->keeptot==2)) {
-		float dx= ((float)(v2d->mask.xmax-v2d->mask.xmin+1))/(v2d->cur.xmax-v2d->cur.xmin);
-		float dy= ((float)(v2d->mask.ymax-v2d->mask.ymin+1))/(v2d->cur.ymax-v2d->cur.ymin);
+	if ((v2d->scroll)) {
+		float dx= (v2d->cur.xmax-v2d->cur.xmin)/((float)(v2d->mask.xmax-v2d->mask.xmin+1));
+		float dy= (v2d->cur.ymax-v2d->cur.ymin)/((float)(v2d->mask.ymax-v2d->mask.ymin+1));
 		
 		if (v2d->mask.xmin != 0)
 			curmasked->xmin -= dx*(float)v2d->mask.xmin;