diff options
author | Joerg Mueller <nexyon@gmail.com> | 2011-08-02 16:16:06 +0400 |
---|---|---|
committer | Joerg Mueller <nexyon@gmail.com> | 2011-08-02 16:16:06 +0400 |
commit | 4e8e502c0267faa68ce686df51cfb061d73ae93e (patch) | |
tree | bf68517c1b537247b52b34d206cc640dc7280b31 /source/blender/editors/transform/transform_ops.c | |
parent | f5cff8ad37edbb46f155e768a07ff6785938f1b9 (diff) | |
parent | de0db6c8daaf4f6276b43bd4c78d623fdb0eafb9 (diff) |
Merging trunk up to r38932.
Diffstat (limited to 'source/blender/editors/transform/transform_ops.c')
-rw-r--r-- | source/blender/editors/transform/transform_ops.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/source/blender/editors/transform/transform_ops.c b/source/blender/editors/transform/transform_ops.c index 62a55e2b7c9..4765bc77bf1 100644 --- a/source/blender/editors/transform/transform_ops.c +++ b/source/blender/editors/transform/transform_ops.c @@ -360,6 +360,12 @@ static int transform_modal(bContext *C, wmOperator *op, wmEvent *event) TransInfo *t = op->customdata; + if (event->type == NDOF_MOTION) + { + /* puts("transform_modal: passing through NDOF_MOTION"); */ + return OPERATOR_PASS_THROUGH; + } + /* XXX insert keys are called here, and require context */ t->context= C; exit_code = transformEvent(t, event); |