diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-12-15 20:20:06 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-12-15 20:20:06 +0300 |
commit | 76f50cd17a019fa226e6cf697abdae40bd625905 (patch) | |
tree | efae0504b93b2fc3cf5cbe8998d431526f36508d /source/blender/editors/space_clip/clip_ops.c | |
parent | f51b583ea0379d7cded854b288a7ca95bcdfa46f (diff) |
Fix for clip proxies builder reloading original footage frames
This isn't needed if the source is the image sequence.
Diffstat (limited to 'source/blender/editors/space_clip/clip_ops.c')
-rw-r--r-- | source/blender/editors/space_clip/clip_ops.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/source/blender/editors/space_clip/clip_ops.c b/source/blender/editors/space_clip/clip_ops.c index 787a7fca273..9f9ac66de60 100644 --- a/source/blender/editors/space_clip/clip_ops.c +++ b/source/blender/editors/space_clip/clip_ops.c @@ -1307,7 +1307,14 @@ static void proxy_endjob(void *pjv) if (pj->index_context) IMB_anim_index_rebuild_finish(pj->index_context, pj->stop); - BKE_movieclip_reload(pj->clip); + if (pj->clip->source == MCLIP_SRC_MOVIE) { + /* Timecode might have changed, so do a full reload to deal with this. */ + BKE_movieclip_reload(pj->clip); + } + else { + /* For image sequences we'll preserve original cache. */ + BKE_movieclip_clear_proxy_cache(pj->clip); + } WM_main_add_notifier(NC_MOVIECLIP | ND_DISPLAY, pj->clip); } |