Merge branch 'master' into blender2.8

2017-10-29 17:31:55 +01:00
parent 405980b1fa 6099b2620d
commit 34859b285a
6 changed files with 25 additions and 3 deletions
--- 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. */