Merge branch 'master' into blender2.8

Conflicts: source/blender/blenkernel/BKE_object.h
2018-04-04 15:03:55 +02:00
parent 59562e5b25 d59c2d12b1
commit 160e62b88c
12 changed files with 39 additions and 55 deletions
--- a/source/blender/modifiers/intern/MOD_meshsequencecache.c
+++ b/source/blender/modifiers/intern/MOD_meshsequencecache.c
@@ -74,10 +74,6 @@ static void freeData(ModifierData *md)
 {
 	MeshSeqCacheModifierData *mcmd = (MeshSeqCacheModifierData *) md;

-	if (mcmd->cache_file) {
-		id_us_min(&mcmd->cache_file->id);
-	}
-
 	if (mcmd->reader) {
 #ifdef WITH_ALEMBIC
 		CacheReader_free(mcmd->reader);