diff options
Diffstat (limited to 'source/blender/blenkernel/intern/cachefile.c')
| -rw-r--r-- | source/blender/blenkernel/intern/cachefile.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/blenkernel/intern/cachefile.c b/source/blender/blenkernel/intern/cachefile.c index 338c74d550c..6b6b7223a0b 100644 --- a/source/blender/blenkernel/intern/cachefile.c +++ b/source/blender/blenkernel/intern/cachefile.c @@ -395,8 +395,8 @@ bool BKE_cachefile_filepath_get(const Main *bmain, if (cache_file->is_sequence && BLI_path_frame_get(r_filepath, &fframe, &frame_len)) { Scene *scene = DEG_get_evaluated_scene(depsgraph); const float ctime = BKE_scene_ctime_get(scene); - const float fps = (((double)scene->r.frs_sec) / (double)scene->r.frs_sec_base); - const float frame = BKE_cachefile_time_offset(cache_file, ctime, fps); + const double fps = (((double)scene->r.frs_sec) / (double)scene->r.frs_sec_base); + const int frame = (int)BKE_cachefile_time_offset(cache_file, (double)ctime, fps); char ext[32]; BLI_path_frame_strip(r_filepath, ext); @@ -410,10 +410,10 @@ bool BKE_cachefile_filepath_get(const Main *bmain, return true; } -float BKE_cachefile_time_offset(const CacheFile *cache_file, const float time, const float fps) +double BKE_cachefile_time_offset(const CacheFile *cache_file, const double time, const double fps) { - const float time_offset = cache_file->frame_offset / fps; - const float frame = (cache_file->override_frame ? cache_file->frame : time); + const double time_offset = (double)cache_file->frame_offset / fps; + const double frame = (cache_file->override_frame ? (double)cache_file->frame : time); return cache_file->is_sequence ? frame : frame / fps - time_offset; } |