diff options
| author | Lukas Tönne <lukas.toenne@gmail.com> | 2015-06-02 16:27:18 +0300 |
|---|---|---|
| committer | Lukas Tönne <lukas.toenne@gmail.com> | 2015-06-02 16:27:18 +0300 |
| commit | 08667e616f560f9d89d7f75c940a6a5ba22469d6 (patch) | |
| tree | 9b2b80d7fa6e4dd5592c97fd4b633e44b71cf76b /source/blender/makesrna/intern/rna_object.c | |
| parent | f0d15a679877cc9b7560c2647324421790c8d166 (diff) | |
| parent | 1ae3ffb6c95c6ba4a95e7feba18f7e87580a6c5b (diff) | |
Merge branch 'alembic' into gooseberry
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 dc4cfd7cc20..17c75da2c87 100644 --- a/source/blender/makesrna/intern/rna_object.c +++ b/source/blender/makesrna/intern/rna_object.c @@ -1675,7 +1675,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)) @@ -1727,7 +1727,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)) |