diff options
| author | Ton Roosendaal <ton@blender.org> | 2006-04-14 19:29:52 +0400 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2006-04-14 19:29:52 +0400 |
| commit | a204ccd2877a4c8eddffdba71f5f9fa0c654935b (patch) | |
| tree | 36612485c9cc2b6c10ce5a364bf3d58bdfdf6003 | |
| parent | 187cc0a5fe854f01dea750db1130e24f7347ab45 (diff) | |
#bugfix #3682
NLA and Action window sometimes suffered from very weird scaled display,
caused by making the subwindow very small. Was a missing check for small
sizes.
Also in this commit removal of debug print N_T left in for ipos.
| -rw-r--r-- | source/blender/src/drawipo.c | 4 | ||||
| -rw-r--r-- | source/blender/src/editipo_mods.c | 4 | ||||
| -rw-r--r-- | source/blender/src/space.c | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/source/blender/src/drawipo.c b/source/blender/src/drawipo.c index 94126bf01f7..11a49790580 100644 --- a/source/blender/src/drawipo.c +++ b/source/blender/src/drawipo.c @@ -506,13 +506,15 @@ void test_view2d(View2D *v2d, int winx, int winy) if(v2d->scroll & L_SCROLL) winx-= SCROLLB; if(v2d->scroll & B_SCROLL) winy-= SCROLLH; + /* header completely closed window */ + if(winy<=0) return; + cur= &v2d->cur; tot= &v2d->tot; dx= cur->xmax-cur->xmin; dy= cur->ymax-cur->ymin; - /* Reevan's test */ if (v2d->keepzoom & V2D_LOCKZOOM_Y) v2d->cur.ymax=v2d->cur.ymin+((float)winy); diff --git a/source/blender/src/editipo_mods.c b/source/blender/src/editipo_mods.c index 85119d9a2cc..be403953721 100644 --- a/source/blender/src/editipo_mods.c +++ b/source/blender/src/editipo_mods.c @@ -177,8 +177,8 @@ void swap_visible_editipo(void) ei->flag |= IPO_SELECT; } } - else ei->flag &= ~IPO_VISIBLE; - printf("FSISWAP %d, icu%d %d|%d\n", ei->flag, (int)ei->icu, IPO_VISIBLE,IPO_SELECT); + else + ei->flag &= ~IPO_VISIBLE; ei++; } diff --git a/source/blender/src/space.c b/source/blender/src/space.c index c338efec075..0baa511417e 100644 --- a/source/blender/src/space.c +++ b/source/blender/src/space.c @@ -3854,7 +3854,7 @@ static void changeactionspace(ScrArea *sa, void *spacedata) if(G.v2d==0) return; /* this sets the sub-areas correct, for scrollbars */ - test_view2d(G.v2d, curarea->winx, curarea->winy); + test_view2d(G.v2d, sa->winx, sa->winy); /* action space uses weird matrices... local calculated in a function */ // myortho2(G.v2d->cur.xmin, G.v2d->cur.xmax, G.v2d->cur.ymin, G.v2d->cur.ymax); |