diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-11-27 15:43:48 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-11-27 15:43:48 +0300 |
| commit | 93b8098e0ef2aa4f9dd7a8393086173e4e59eb5a (patch) | |
| tree | 53305130d5aff4be3ced934b179fd1b93d0e7694 /source/blender/editors/space_view3d/view3d_view.c | |
| parent | 5ca3d1919ca9283dbd56f44684a27d11ea35ccb3 (diff) | |
Fix for bug #20039: panning and rotating view makes animation playback slow.
Recent click event changes moved variable up one level too far.
Also fixes use of timer event for fly operator, it should always check for
which timer it is, not really related to this bug.
Diffstat (limited to 'source/blender/editors/space_view3d/view3d_view.c')
| -rw-r--r-- | source/blender/editors/space_view3d/view3d_view.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/space_view3d/view3d_view.c b/source/blender/editors/space_view3d/view3d_view.c index eb1712e19a3..62374ca3134 100644 --- a/source/blender/editors/space_view3d/view3d_view.c +++ b/source/blender/editors/space_view3d/view3d_view.c @@ -1967,7 +1967,7 @@ static int flyEnd(bContext *C, FlyInfo *fly) void flyEvent(FlyInfo *fly, wmEvent *event) { - if (event->type == TIMER) { + if (event->type == TIMER && event->customdata == fly->timer) { fly->redraw = 1; } else if (event->type == MOUSEMOVE) { @@ -2426,7 +2426,7 @@ static int fly_modal(bContext *C, wmOperator *op, wmEvent *event) flyEvent(fly, event); - if(event->type==TIMER) + if(event->type==TIMER && event->customdata == fly->timer) flyApply(fly); if(fly->redraw) {; |