Merge branch 'alembic' into gooseberry

2 files changed, 15 insertions, 1 deletions

diff --git a/source/blender/blenkernel/intern/cache_library.c b/source/blender/blenkernel/intern/cache_library.c
index 1a1672c3e4c..37cc45d7f9e 100644
--- a/source/blender/blenkernel/intern/cache_library.c
+++ b/source/blender/blenkernel/intern/cache_library.c
@@ -371,6 +371,15 @@ static struct PTCReaderArchive *find_active_cache(Scene *scene, CacheLibrary *ca
 		archive = PTC_open_reader_archive(scene, filename);
 	}
 	
+	/* get basic archive info */
+	if (cachelib->archive_info)
+		BKE_cache_archive_info_clear(cachelib->archive_info);
+	else
+		cachelib->archive_info = BKE_cache_archive_info_new();
+	BLI_strncpy(cachelib->archive_info->filepath, filename, sizeof(cachelib->archive_info->filepath));
+	if (archive)
+		PTC_get_archive_info(archive, cachelib->archive_info);
+	
 	return archive;
 }
 
@@ -2166,6 +2175,11 @@ void BKE_cache_archive_info_free(CacheArchiveInfo *info)
 
 void BKE_cache_archive_info_clear(CacheArchiveInfo *info)
 {
+	info->filepath[0] = '\0';
+	info->app_name[0] = '\0';
+	info->date_written[0] = '\0';
+	info->description[0] = '\0';
+	
 	if (info->root_node) {
 		cache_archive_info_node_free(info->root_node);
 		info->root_node = NULL;
diff --git a/source/blender/blenkernel/intern/object_dupli.c b/source/blender/blenkernel/intern/object_dupli.c
index 9943e351b87..fd0d0daf7e4 100644
--- a/source/blender/blenkernel/intern/object_dupli.c
+++ b/source/blender/blenkernel/intern/object_dupli.c
@@ -1234,7 +1234,7 @@ static const DupliGenerator *get_dupli_generator(const DupliContext *ctx)
 ListBase *object_duplilist_ex(EvaluationContext *eval_ctx, Scene *scene, Object *ob, bool update)
 {
 	if (update) {
-		BKE_object_dupli_cache_update(scene, ob, eval_ctx, (float)scene->r.cfra);
+		BKE_object_dupli_cache_update(scene, ob, eval_ctx, (float)scene->r.cfra + scene->r.subframe);
 	}
 	
 	if (ob->dup_cache && (ob->dup_cache->result != CACHE_READ_SAMPLE_INVALID)) {