[Bf-blender-cvs] [8d8ae93] alembic_basic_io: Rename BKE_cachefiles_open_next_file to BKE_cachefile_update_frame.
Kévin Dietrich
noreply at git.blender.org
Fri Jun 24 22:29:29 CEST 2016
Commit: 8d8ae93cabef2ef89cbfedb07330d130febed4c4
Author: Kévin Dietrich
Date: Fri Jun 24 18:45:38 2016 +0200
Branches: alembic_basic_io
https://developer.blender.org/rB8d8ae93cabef2ef89cbfedb07330d130febed4c4
Rename BKE_cachefiles_open_next_file to BKE_cachefile_update_frame.
===================================================================
M source/blender/blenkernel/BKE_cachefile.h
M source/blender/blenkernel/intern/cachefile.c
M source/blender/blenkernel/intern/scene.c
===================================================================
diff --git a/source/blender/blenkernel/BKE_cachefile.h b/source/blender/blenkernel/BKE_cachefile.h
index 004ea20..f81c5aa 100644
--- a/source/blender/blenkernel/BKE_cachefile.h
+++ b/source/blender/blenkernel/BKE_cachefile.h
@@ -43,7 +43,7 @@ void BKE_cachefile_free(struct CacheFile *cache_file);
void BKE_cachefile_load(struct CacheFile *cache_file, const char *relabase);
-void BKE_cachefiles_open_next_file(struct Main *bmain, float ctime);
+void BKE_cachefile_update_frame(struct Main *bmain, float ctime);
bool BKE_cachefile_filepath_get(struct CacheFile *cache_file, float frame,
char *r_filename);
diff --git a/source/blender/blenkernel/intern/cachefile.c b/source/blender/blenkernel/intern/cachefile.c
index 0f93686..334de78 100644
--- a/source/blender/blenkernel/intern/cachefile.c
+++ b/source/blender/blenkernel/intern/cachefile.c
@@ -90,7 +90,7 @@ void BKE_cachefile_load(CacheFile *cache_file, const char *relabase)
#endif
}
-void BKE_cachefiles_open_next_file(Main *bmain, float ctime)
+void BKE_cachefile_update_frame(Main *bmain, float ctime)
{
CacheFile *cache_file;
char filename[FILE_MAX];
diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c
index d285154..8c37402 100644
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@ -1904,7 +1904,9 @@ void BKE_scene_update_for_newframe_ex(EvaluationContext *eval_ctx, Main *bmain,
#endif
BKE_mask_evaluate_all_masks(bmain, ctime, true);
- BKE_cachefiles_open_next_file(bmain, ctime);
+
+ /* Update animated cache files for modifiers. */
+ BKE_cachefile_update_frame(bmain, ctime);
#ifdef POSE_ANIMATION_WORKAROUND
scene_armature_depsgraph_workaround(bmain);
More information about the Bf-blender-cvs
mailing list