[Bf-blender-cvs] [8563494823b] blender2.8: Merge branch 'master' into blender2.8

[Bastien Montagne]

Commit: 8563494823bd3ad9643e0e05c88eee7763196be8
Author: Bastien Montagne
Date:   Tue Aug 8 19:16:25 2017 +0200
Branches: blender2.8
https://developer.blender.org/rB8563494823bd3ad9643e0e05c88eee7763196be8

Merge branch 'master' into blender2.8

Conflicts:
	source/blender/modifiers/intern/MOD_meshsequencecache.c

===================================================================



===================================================================

diff --cc source/blender/modifiers/intern/MOD_meshsequencecache.c
index 5d623295edf,411779c508c..5c2f1aba8e1
--- a/source/blender/modifiers/intern/MOD_meshsequencecache.c
+++ b/source/blender/modifiers/intern/MOD_meshsequencecache.c
@@@ -92,9 -95,9 +94,9 @@@ static bool isDisabled(ModifierData *md
  	return (mcmd->cache_file == NULL) || (mcmd->object_path[0] == '\0');
  }
  
 -static DerivedMesh *applyModifier(ModifierData *md, Object *ob,
 -                                  DerivedMesh *dm,
 +static DerivedMesh *applyModifier(ModifierData *md, struct EvaluationContext *UNUSED(eval_ctx),
 +                                  Object *ob, DerivedMesh *dm,
-                                   ModifierApplyFlag flag)
+                                   ModifierApplyFlag UNUSED(flag))
  {
  #ifdef WITH_ALEMBIC
  	MeshSeqCacheModifierData *mcmd = (MeshSeqCacheModifierData *) md;