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/modifiers/intern/MOD_meshsequencecache.c
+++ b/source/blender/modifiers/intern/MOD_meshsequencecache.c
@@ -108,7 +108,6 @@ static DerivedMesh *applyModifier(ModifierData *md, const struct EvaluationConte
 	Scene *scene = md->scene;
 	const float frame = BKE_scene_frame_get(scene);
 	const float time = BKE_cachefile_time_offset(mcmd->cache_file, frame, FPS);
-
 	const char *err_str = NULL;

 	CacheFile *cache_file = mcmd->cache_file;