diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-05-20 11:40:05 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-05-20 11:40:05 +0400 |
| commit | 9f766c71b0a98801600c775dfc46faee84ddf49e (patch) | |
| tree | e8d933e20df512eb836062e0f8cf9191f32c1141 /source/blender/editors/transform | |
| parent | 2338765726a5aa6b8870d573d685218720864583 (diff) | |
use event->mval rather then subtracting ar->winrct.x / y from event->x / y
Diffstat (limited to 'source/blender/editors/transform')
4 files changed, 5 insertions, 9 deletions
diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c index 4ea1e8742f5..3643b183b31 100644 --- a/source/blender/editors/transform/transform.c +++ b/source/blender/editors/transform/transform.c @@ -567,8 +567,7 @@ int transformEvent(TransInfo *t, wmEvent *event) if (t->modifiers & MOD_CONSTRAINT_SELECT) t->con.mode |= CON_SELECT; - t->mval[0] = event->x - t->ar->winrct.xmin; - t->mval[1] = event->y - t->ar->winrct.ymin; + VECCOPY2D(t->mval, event->mval); // t->redraw |= TREDRAW_SOFT; /* Use this for soft redraw. Might cause flicker in object mode */ t->redraw |= TREDRAW_HARD; diff --git a/source/blender/editors/transform/transform.h b/source/blender/editors/transform/transform.h index b55435fd0cf..0e0d452a9e6 100644 --- a/source/blender/editors/transform/transform.h +++ b/source/blender/editors/transform/transform.h @@ -648,7 +648,7 @@ typedef enum { void initMouseInput(TransInfo *t, MouseInput *mi, int center[2], int mval[2]); void initMouseInputMode(TransInfo *t, MouseInput *mi, MouseInputMode mode); int handleMouseInput(struct TransInfo *t, struct MouseInput *mi, struct wmEvent *event); -void applyMouseInput(struct TransInfo *t, struct MouseInput *mi, int mval[2], float output[3]); +void applyMouseInput(struct TransInfo *t, struct MouseInput *mi, const int mval[2], float output[3]); void setCustomPoints(TransInfo *t, MouseInput *mi, int start[2], int end[2]); void setInputPostFct(MouseInput *mi, void (*post)(struct TransInfo *, float [3])); diff --git a/source/blender/editors/transform/transform_generics.c b/source/blender/editors/transform/transform_generics.c index 67e04bbd34e..8699eb1cc2d 100644 --- a/source/blender/editors/transform/transform_generics.c +++ b/source/blender/editors/transform/transform_generics.c @@ -920,9 +920,7 @@ int initTransInfo (bContext *C, TransInfo *t, wmOperator *op, wmEvent *event) if (event) { - t->imval[0] = event->x - t->ar->winrct.xmin; - t->imval[1] = event->y - t->ar->winrct.ymin; - + VECCOPY2D(t->imval, event->mval); t->event_type = event->type; } else diff --git a/source/blender/editors/transform/transform_input.c b/source/blender/editors/transform/transform_input.c index 7a16e25302c..b3608305a7a 100644 --- a/source/blender/editors/transform/transform_input.c +++ b/source/blender/editors/transform/transform_input.c @@ -372,7 +372,7 @@ void setInputPostFct(MouseInput *mi, void (*post)(struct TransInfo *, float [3]) mi->post = post; } -void applyMouseInput(TransInfo *t, MouseInput *mi, int mval[2], float output[3]) +void applyMouseInput(TransInfo *t, MouseInput *mi, const int mval[2], float output[3]) { if (mi->apply != NULL) { @@ -398,8 +398,7 @@ int handleMouseInput(TransInfo *t, MouseInput *mi, wmEvent *event) t->modifiers |= MOD_PRECISION; /* shift is modifier for higher precision transform * store the mouse position where the normal movement ended */ - mi->precision_mval[0] = event->x - t->ar->winrct.xmin; - mi->precision_mval[1] = event->y - t->ar->winrct.ymin; + VECCOPY2D(mi->precision_mval, event->mval); mi->precision = 1; } else |