- code that limited zooming in and zooming out for spaces like sequencer,
audiotimeline, etc. was accidentally removed in 2.30 UI makeover. put it back. fixes report in tracker from Cessen, thnx!
This commit is contained in:
@@ -964,7 +964,7 @@ static void editing_panel_curve_type(Object *ob, Curve *cu)
|
|||||||
if(ob->type!=OB_SURF) {
|
if(ob->type!=OB_SURF) {
|
||||||
|
|
||||||
if(ob->type==OB_CURVE) {
|
if(ob->type==OB_CURVE) {
|
||||||
static float prlen;
|
extern float prlen; // buttons_object.c, should be moved....
|
||||||
char str[32];
|
char str[32];
|
||||||
uiBlockBeginAlign(block);
|
uiBlockBeginAlign(block);
|
||||||
uiDefButS(block, NUM, B_RECALCPATH, "PathLen:", 600,50,150,19, &cu->pathlen, 1.0, 9000.0, 0, 0, "");
|
uiDefButS(block, NUM, B_RECALCPATH, "PathLen:", 600,50,150,19, &cu->pathlen, 1.0, 9000.0, 0, 0, "");
|
||||||
|
|||||||
@@ -418,6 +418,33 @@ void test_view2d(View2D *v2d, int winx, int winy)
|
|||||||
cur->ymax= temp+0.5*dy;
|
cur->ymax= temp+0.5*dy;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
else {
|
||||||
|
if(dx<G.v2d->min[0]) {
|
||||||
|
dx= G.v2d->min[0];
|
||||||
|
temp= 0.5*(cur->xmax+cur->xmin);
|
||||||
|
cur->xmin= temp-0.5*dx;
|
||||||
|
cur->xmax= temp+0.5*dx;
|
||||||
|
}
|
||||||
|
else if(dx>G.v2d->max[0]) {
|
||||||
|
dx= G.v2d->max[0];
|
||||||
|
temp= 0.5*(cur->xmax+cur->xmin);
|
||||||
|
cur->xmin= temp-0.5*dx;
|
||||||
|
cur->xmax= temp+0.5*dx;
|
||||||
|
}
|
||||||
|
|
||||||
|
if(dy<G.v2d->min[1]) {
|
||||||
|
dy= G.v2d->min[1];
|
||||||
|
temp= 0.5*(cur->ymax+cur->ymin);
|
||||||
|
cur->ymin= temp-0.5*dy;
|
||||||
|
cur->ymax= temp+0.5*dy;
|
||||||
|
}
|
||||||
|
else if(dy>G.v2d->max[1]) {
|
||||||
|
dy= G.v2d->max[1];
|
||||||
|
temp= 0.5*(cur->ymax+cur->ymin);
|
||||||
|
cur->ymin= temp-0.5*dy;
|
||||||
|
cur->ymax= temp+0.5*dy;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if(v2d->keepaspect) {
|
if(v2d->keepaspect) {
|
||||||
short do_x=0, do_y=0;
|
short do_x=0, do_y=0;
|
||||||
|
|||||||
Reference in New Issue
Block a user