[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [33890] trunk/blender/source/blender/ editors/interface/view2d.c: Fix #25375: Vertical numbers in F-Curve Editor out-of-alignment with grid

Sergey Sharybin g.ulairi at gmail.com
Sun Dec 26 11:34:09 CET 2010


Revision: 33890
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33890
Author:   nazgul
Date:     2010-12-26 11:34:09 +0100 (Sun, 26 Dec 2010)

Log Message:
-----------
Fix #25375: Vertical numbers in F-Curve Editor out-of-alignment with grid

Issue caused because previously sliders used a separate mask and now they're
drawing inside of region.

Thanks to AlexKu for point and Ton for checking :)

Modified Paths:
--------------
    trunk/blender/source/blender/editors/interface/view2d.c

Modified: trunk/blender/source/blender/editors/interface/view2d.c
===================================================================
--- trunk/blender/source/blender/editors/interface/view2d.c	2010-12-24 16:45:04 UTC (rev 33889)
+++ trunk/blender/source/blender/editors/interface/view2d.c	2010-12-26 10:34:09 UTC (rev 33890)
@@ -1697,10 +1697,10 @@
 			 *	  NOTE: it's assumed that that scrollbar is there if this is involved!
 			 */
 			fac= (grid->starty- v2d->cur.ymin) / (v2d->cur.ymax - v2d->cur.ymin);
-			fac= (vert.ymin + V2D_SCROLL_HEIGHT) + fac*(vert.ymax - vert.ymin - V2D_SCROLL_HEIGHT);
+			fac= vert.ymin + fac*(vert.ymax - vert.ymin);
 			
 			dfac= (grid->dy) / (v2d->cur.ymax - v2d->cur.ymin);
-			dfac= dfac * (vert.ymax - vert.ymin - V2D_SCROLL_HEIGHT);
+			dfac= dfac * (vert.ymax - vert.ymin);
 			
 			/* set starting value, and text color */
 			UI_ThemeColor(TH_TEXT);





More information about the Bf-blender-cvs mailing list