diff options
| author | Sybren A. Stüvel <sybren@stuvel.eu> | 2017-10-29 19:31:55 +0300 |
|---|---|---|
| committer | Sybren A. Stüvel <sybren@stuvel.eu> | 2017-10-29 19:31:55 +0300 |
| commit | 34859b285aff14b022c9b175fa2babfff7c63314 (patch) | |
| tree | a07bfadfa50a516af32ee9ef6fdc0c68302c55fb /source/blender/blenkernel/intern/cachefile.c | |
| parent | 405980b1facff4a76e3661a412eab1d072d0236f (diff) | |
| parent | 6099b2620d645f4129c42af2272cb6bd8538fc7a (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenkernel/intern/cachefile.c')
| -rw-r--r-- | source/blender/blenkernel/intern/cachefile.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/cachefile.c b/source/blender/blenkernel/intern/cachefile.c index 9d02a27187c..f8215668034 100644 --- a/source/blender/blenkernel/intern/cachefile.c +++ b/source/blender/blenkernel/intern/cachefile.c @@ -211,8 +211,9 @@ bool BKE_cachefile_filepath_get( float BKE_cachefile_time_offset(CacheFile *cache_file, const float time, const float fps) { + const float time_offset = cache_file->frame_offset / fps; const float frame = (cache_file->override_frame ? cache_file->frame : time); - return cache_file->is_sequence ? frame : frame / fps; + return cache_file->is_sequence ? frame : frame / fps - time_offset; } /* TODO(kevin): replace this with some depsgraph mechanism, or something similar. */ |