diff options
author | Campbell Barton <ideasman42@gmail.com> | 2017-07-10 10:48:57 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2017-07-10 10:48:57 +0300 |
commit | 7d5e9285b559cc69cc722913ae4adf1e247943eb (patch) | |
tree | f495d5db2f87fd88d53e05db76988201064df1df /source/blender/windowmanager/intern/wm_playanim.c | |
parent | 2bd908ca6ebc97873ad94735facc1e8188a009b0 (diff) | |
parent | 5b1c1d4d23831923f9d4a15f81e1cd7199dde5a9 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/windowmanager/intern/wm_playanim.c')
-rw-r--r-- | source/blender/windowmanager/intern/wm_playanim.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/source/blender/windowmanager/intern/wm_playanim.c b/source/blender/windowmanager/intern/wm_playanim.c index e2e0d7dd450..fdcded8e50a 100644 --- a/source/blender/windowmanager/intern/wm_playanim.c +++ b/source/blender/windowmanager/intern/wm_playanim.c @@ -1437,8 +1437,7 @@ static char *wm_main_playanim_intern(int argc, const char **argv) ps.next_frame = ps.direction; - - while ((hasevent = GHOST_ProcessEvents(g_WS.ghost_system, 0)) || ps.wait2) { + while ((hasevent = GHOST_ProcessEvents(g_WS.ghost_system, ps.wait2))) { if (hasevent) { GHOST_DispatchEvents(g_WS.ghost_system); } |