[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [19232] branches/blender2.5/blender/source /blender/editors: Graph Editor: Frame numbers in horizontal scrollbar are no longer restricted to 1. 0 frame intervals.
Joshua Leung
aligorith at gmail.com
Mon Mar 9 08:00:40 CET 2009
Revision: 19232
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=19232
Author: aligorith
Date: 2009-03-09 08:00:40 +0100 (Mon, 09 Mar 2009)
Log Message:
-----------
Graph Editor: Frame numbers in horizontal scrollbar are no longer restricted to 1.0 frame intervals.
Modified Paths:
--------------
branches/blender2.5/blender/source/blender/editors/include/UI_view2d.h
branches/blender2.5/blender/source/blender/editors/interface/view2d.c
branches/blender2.5/blender/source/blender/editors/space_graph/space_graph.c
Modified: branches/blender2.5/blender/source/blender/editors/include/UI_view2d.h
===================================================================
--- branches/blender2.5/blender/source/blender/editors/include/UI_view2d.h 2009-03-09 05:01:16 UTC (rev 19231)
+++ branches/blender2.5/blender/source/blender/editors/include/UI_view2d.h 2009-03-09 07:00:40 UTC (rev 19232)
@@ -68,6 +68,7 @@
/* for drawing time */
V2D_UNIT_SECONDS = 0,
V2D_UNIT_FRAMES,
+ V2D_UNIT_FRAMESCALE,
/* for drawing values */
V2D_UNIT_VALUES,
Modified: branches/blender2.5/blender/source/blender/editors/interface/view2d.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/interface/view2d.c 2009-03-09 05:01:16 UTC (rev 19231)
+++ branches/blender2.5/blender/source/blender/editors/interface/view2d.c 2009-03-09 07:00:40 UTC (rev 19232)
@@ -1468,10 +1468,14 @@
/* draw numbers in the appropriate range */
if (dfac > 0.0f) {
for (; fac < hor.xmax; fac+=dfac, val+=grid->dx) {
- switch (vs->xunits) {
+ switch (vs->xunits) {
case V2D_UNIT_FRAMES: /* frames (as whole numbers)*/
scroll_printstr(vs, scene, fac, 3.0f+(float)(hor.ymin), val, grid->powerx, V2D_UNIT_FRAMES, 'h');
break;
+
+ case V2D_UNIT_FRAMESCALE: /* frames (not always as whole numbers) */
+ scroll_printstr(vs, scene, fac, 3.0f+(float)(hor.ymin), val, grid->powerx, V2D_UNIT_FRAMESCALE, 'h');
+ break;
case V2D_UNIT_SECONDS: /* seconds */
fac2= val/(float)FPS;
@@ -1490,7 +1494,7 @@
}
break;
- case V2D_UNIT_DEGREES: /* IPO-Editor for rotation IPO-Drivers */
+ case V2D_UNIT_DEGREES: /* Graph Editor for rotation Drivers */
/* HACK: although we're drawing horizontal, we make this draw as 'vertical', just to get degree signs */
scroll_printstr(vs, scene, fac, 3.0f+(float)(hor.ymin), val, grid->powerx, V2D_UNIT_DEGREES, 'v');
break;
Modified: branches/blender2.5/blender/source/blender/editors/space_graph/space_graph.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_graph/space_graph.c 2009-03-09 05:01:16 UTC (rev 19231)
+++ branches/blender2.5/blender/source/blender/editors/space_graph/space_graph.c 2009-03-09 07:00:40 UTC (rev 19232)
@@ -227,7 +227,7 @@
UI_view2d_view_ortho(C, v2d);
/* grid */
- unitx= (sipo->flag & SIPO_DRAWTIME)? V2D_UNIT_SECONDS : V2D_UNIT_FRAMES;
+ unitx= (sipo->flag & SIPO_DRAWTIME)? V2D_UNIT_SECONDS : V2D_UNIT_FRAMESCALE;
grid= UI_view2d_grid_calc(C, v2d, unitx, V2D_GRID_NOCLAMP, unity, V2D_GRID_NOCLAMP, ar->winx, ar->winy);
UI_view2d_grid_draw(C, v2d, grid, V2D_GRIDLINES_ALL);
UI_view2d_grid_free(grid);
More information about the Bf-blender-cvs
mailing list