griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Correction to zoom-t-mouse formula which was broken since view2d drag zoom refactoring

Browse Source
This commit is contained in:
Sergey Sharybin
2012-10-08 17:41:27 +00:00
parent 82310c2f59
commit de6e47ab3d
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
source/blender/editors/interface/view2d_ops.c
View File

@@ -849,8 +849,8 @@ static void view_zoomdrag_apply(bContext *C, wmOperator *op)
float mval_faci = 1.0f - mval_fac;
float ofs = (mval_fac * dx) - (mval_faci * dx);
v2d->cur.xmin += ofs - dx;
v2d->cur.xmax += ofs + dx;
v2d->cur.xmin -= ofs + dx;
v2d->cur.xmax -= ofs - dx;
}
else {
v2d->cur.xmin -= dx;
@@ -868,8 +868,8 @@ static void view_zoomdrag_apply(bContext *C, wmOperator *op)
float mval_faci = 1.0f - mval_fac;
float ofs = (mval_fac * dy) - (mval_faci * dy);
v2d->cur.ymin += ofs - dy;
v2d->cur.ymax += ofs + dy;
v2d->cur.ymin -= ofs + dy;
v2d->cur.ymax -= ofs - dy;
}
else {
v2d->cur.ymin -= dy;
@@ -1045,13 +1045,13 @@ static int view_zoomdrag_modal(bContext *C, wmOperator *op, wmEvent *event)
/* set transform amount, and add current deltas to stored total delta (for redo) */
if (U.uiflag & USER_ZOOM_INVERT) {
RNA_float_set(op->ptr, "deltax", -dx);
RNA_float_set(op->ptr, "deltay", -dy);
}
else {
RNA_float_set(op->ptr, "deltax", dx);
RNA_float_set(op->ptr, "deltay", dy);
dx *= -1;
dy *= -1;
}
RNA_float_set(op->ptr, "deltax", dx);
RNA_float_set(op->ptr, "deltay", dy);
vzd->dx += dx;
vzd->dy += dy;