From 2a638fa3cd60640bb1d5da40fe94214c81945e02 Mon Sep 17 00:00:00 2001 From: Joshua Leung Date: Sat, 7 Feb 2009 10:39:20 +0000 Subject: [PATCH] View2D bugfix: The previous fix for zooming only worked as lucky coincident. It was the flag that was wrong, not the var. --- source/blender/editors/interface/view2d_ops.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/source/blender/editors/interface/view2d_ops.c b/source/blender/editors/interface/view2d_ops.c index d2f9f014107..cd89c520092 100644 --- a/source/blender/editors/interface/view2d_ops.c +++ b/source/blender/editors/interface/view2d_ops.c @@ -487,12 +487,12 @@ static void view_zoomstep_apply(bContext *C, wmOperator *op) dx= (v2d->cur.xmax - v2d->cur.xmin) * (float)RNA_float_get(op->ptr, "zoomfacx"); dy= (v2d->cur.ymax - v2d->cur.ymin) * (float)RNA_float_get(op->ptr, "zoomfacy"); - /* only move view on an axis if change is allowed */ - if ((v2d->keepofs & V2D_LOCKOFS_X)==0) { + /* only resize view on an axis if change is allowed */ + if ((v2d->keepzoom & V2D_LOCKZOOM_X)==0) { v2d->cur.xmin += dx; v2d->cur.xmax -= dx; } - if ((v2d->keepofs & V2D_LOCKOFS_Y)==0) { + if ((v2d->keepzoom & V2D_LOCKZOOM_Y)==0) { v2d->cur.ymin += dy; v2d->cur.ymax -= dy; }