diff options
| author | Joshua Leung <aligorith@gmail.com> | 2008-12-13 12:25:47 +0300 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2008-12-13 12:25:47 +0300 |
| commit | 4de30b2304025dc4a17b1d2bb0444040d5094e58 (patch) | |
| tree | acf8fd3ffa03cd4f5370d76eebf82eb2ced36727 /source/blender/blenloader | |
| parent | 9f06ed1b367fed6cea55d829ea62ff613b902c87 (diff) | |
View2D:
* Grid calculation now takes separate args for x/y units and clamping
* Timeline now gets V2D_LOCKZOOM_Y flag to prevent zooming in y-axis
Diffstat (limited to 'source/blender/blenloader')
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 6172731b425..5d33deec821 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -5114,8 +5114,7 @@ static void area_add_window_regions(ScrArea *sa, SpaceLink *sl, ListBase *lb) ar->v2d.scroll |= (V2D_SCROLL_BOTTOM|V2D_SCROLL_SCALE_BOTTOM); ar->v2d.align |= V2D_ALIGN_NO_NEG_Y; ar->v2d.keepofs |= V2D_LOCKOFS_Y; - - /* XXX hrmf, force Y zoom to be fixed? */ + ar->v2d.keepzoom |= V2D_LOCKZOOM_Y; ar->v2d.min[1]= ar->v2d.max[1]= 500.0; } break; @@ -5124,7 +5123,7 @@ static void area_add_window_regions(ScrArea *sa, SpaceLink *sl, ListBase *lb) SpaceIpo *sipo= (SpaceIpo *)sl; memcpy(&ar->v2d, &sipo->v2d, sizeof(View2D)); - ar->v2d.scroll= (V2D_SCROLL_BOTTOM|V2D_SCROLL_SCALE_BOTTOM); + ar->v2d.scroll |= (V2D_SCROLL_BOTTOM|V2D_SCROLL_SCALE_BOTTOM); ar->v2d.scroll |= (V2D_SCROLL_LEFT|V2D_SCROLL_SCALE_LEFT); } |