Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Tue, 8 Aug 2017 17:16:25 +0000 (19:16 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Tue, 8 Aug 2017 17:16:25 +0000 (19:16 +0200)
Conflicts:
source/blender/modifiers/intern/MOD_meshsequencecache.c

1  2 
source/blender/editors/interface/interface_layout.c
source/blender/modifiers/intern/MOD_meshsequencecache.c

index 5d623295edf843e1b3417dcd8be666294494f369,411779c508cd41ca66efc8d676ddc296bf4dd7d9..5c2f1aba8e16e9fcdeb1e5c1265fa96e90759925
@@@ -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;