Merge branch 'master' into blender2.8

2018-09-19 11:12:45 +02:00 · 2018-09-19 11:12:45 +02:00 · d053508916
parent 2be5621be8 340527cd37
commit d053508916
1 changed files with 6 additions and 1 deletions
--- a/source/blender/modifiers/intern/MOD_meshsequencecache.c
+++ b/source/blender/modifiers/intern/MOD_meshsequencecache.c
@ -158,8 +158,13 @@ static Mesh *applyModifier(

 static bool dependsOnTime(ModifierData *md)
 {
+#ifdef WITH_ALEMBIC
+	MeshSeqCacheModifierData *mcmd = (MeshSeqCacheModifierData *) md;
+	return (mcmd->cache_file != NULL);
+#else
 	UNUSED_VARS(md);
-	return true;
+	return false;
+#endif
 }

 static void foreachIDLink(