diff options
| author | Sybren A. Stüvel <sybren@stuvel.eu> | 2017-10-29 19:31:55 +0300 |
|---|---|---|
| committer | Sybren A. Stüvel <sybren@stuvel.eu> | 2017-10-29 19:31:55 +0300 |
| commit | 34859b285aff14b022c9b175fa2babfff7c63314 (patch) | |
| tree | a07bfadfa50a516af32ee9ef6fdc0c68302c55fb /source/blender/modifiers | |
| parent | 405980b1facff4a76e3661a412eab1d072d0236f (diff) | |
| parent | 6099b2620d645f4129c42af2272cb6bd8538fc7a (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/modifiers')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_meshsequencecache.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/source/blender/modifiers/intern/MOD_meshsequencecache.c b/source/blender/modifiers/intern/MOD_meshsequencecache.c index 86c2a24eddf..e28459814e2 100644 --- 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; |