diff options
author | Campbell Barton <ideasman42@gmail.com> | 2021-05-07 11:18:11 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2021-05-07 11:18:11 +0300 |
commit | eaffa83fecafc9fe9f922c8eed04d7eae1a5a3c8 (patch) | |
tree | afa5a2dd1a3baa1a495eebde2aa5f3c095fd8df4 | |
parent | f81dca971d49d440343d0ddee93de68010e540a1 (diff) | |
parent | ac2941fb15fafcf28907d84304b48d6f7e14e65f (diff) |
Merge branch 'blender-v2.93-release'
-rw-r--r-- | source/blender/windowmanager/intern/wm_playanim.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/source/blender/windowmanager/intern/wm_playanim.c b/source/blender/windowmanager/intern/wm_playanim.c index 7726eb1b5d3..a209930f978 100644 --- a/source/blender/windowmanager/intern/wm_playanim.c +++ b/source/blender/windowmanager/intern/wm_playanim.c @@ -132,9 +132,6 @@ typedef struct PlayState { int ibufx, ibufy; int fontid; - /* saves passing args */ - struct ImBuf *curframe_ibuf; - /* restarts player for file drop */ char dropped_file[FILE_MAX]; @@ -958,9 +955,9 @@ static int ghost_event_proc(GHOST_EventHandle evt, GHOST_TUserDataPtr ps_void) case GHOST_kKeyNumpadSlash: if (val) { if (g_WS.qual & WS_QUAL_SHIFT) { - if (ps->curframe_ibuf) { + if (ps->picture && ps->picture->ibuf) { printf(" Name: %s | Speed: %.2f frames/s\n", - ps->curframe_ibuf->name, + ps->picture->ibuf->name, ps->fstep / swaptime); } } @@ -1197,7 +1194,8 @@ static int ghost_event_proc(GHOST_EventHandle evt, GHOST_TUserDataPtr ps_void) playanim_gl_matrix(); ptottime = 0.0; - playanim_toscreen(ps, ps->picture, ps->curframe_ibuf, ps->fontid, ps->fstep); + playanim_toscreen( + ps, ps->picture, ps->picture ? ps->picture->ibuf : NULL, ps->fontid, ps->fstep); break; } |