diff options
| author | Lukas Tönne <lukas.toenne@gmail.com> | 2015-05-30 14:28:21 +0300 |
|---|---|---|
| committer | Lukas Tönne <lukas.toenne@gmail.com> | 2015-05-30 14:28:21 +0300 |
| commit | 6d6db87ae7e0e0a75f592e531fc9d8410760fd45 (patch) | |
| tree | 22f50715f37435aea0afe8ca07bb4dc630c0f64e /source/blender/makesrna/intern/rna_object.c | |
| parent | 179acf028cb8fc8ec1ff21670b6d0150361940e4 (diff) | |
Make use of the subframe value in Scene when reading from cache archives.
Subframes are necessary when interpolating values.
Diffstat (limited to 'source/blender/makesrna/intern/rna_object.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_object.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/makesrna/intern/rna_object.c b/source/blender/makesrna/intern/rna_object.c index a02839a9374..edffcf07525 100644 --- a/source/blender/makesrna/intern/rna_object.c +++ b/source/blender/makesrna/intern/rna_object.c @@ -1530,7 +1530,7 @@ Strands *rna_DupliObject_strands_new(DupliObject *dob, ReportList *UNUSED(report bool is_cached = parent->cache_library && (parent->cache_library->source_mode == CACHE_LIBRARY_SOURCE_CACHE || parent->cache_library->display_mode == CACHE_LIBRARY_DISPLAY_RESULT); if (is_cached) { - float frame = (float)scene->r.cfra; + float frame = (float)scene->r.cfra + scene->r.subframe; bool use_render = (settings == 2); if (!ELEM(settings, 1, 2)) @@ -1582,7 +1582,7 @@ StrandsChildren *rna_DupliObject_strands_children_new(DupliObject *dob, ReportLi bool is_cached = parent->cache_library && (parent->cache_library->source_mode == CACHE_LIBRARY_SOURCE_CACHE || parent->cache_library->display_mode == CACHE_LIBRARY_DISPLAY_RESULT); if (is_cached) { - float frame = (float)scene->r.cfra; + float frame = (float)scene->r.cfra + scene->r.subframe; bool use_render = (settings == 2); if (!ELEM(settings, 1, 2)) |