diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-05-08 17:06:32 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-05-08 17:06:32 +0300 |
| commit | 43be4343107b1dc2a05353a6ff41360cce27d629 (patch) | |
| tree | ad47af6e9e207dab52df58c269086c100b613f77 /source/blender/modifiers/intern/MOD_meshsequencecache.c | |
| parent | a48186c5d74b3d353c5c65cd4a930dd98cc9a603 (diff) | |
| parent | 4e4a93bc454d93ec8523f44b73a42977e2868ecc (diff) | |
Merge branch 'master' into blender2.8
Conflicts:
source/blender/modifiers/intern/MOD_dynamicpaint.c
source/blender/modifiers/intern/MOD_uvproject.c
Diffstat (limited to 'source/blender/modifiers/intern/MOD_meshsequencecache.c')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_meshsequencecache.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/source/blender/modifiers/intern/MOD_meshsequencecache.c b/source/blender/modifiers/intern/MOD_meshsequencecache.c index b908d6f4bda..26ea7af9764 100644 --- a/source/blender/modifiers/intern/MOD_meshsequencecache.c +++ b/source/blender/modifiers/intern/MOD_meshsequencecache.c @@ -64,9 +64,6 @@ static void copyData(const ModifierData *md, ModifierData *target) modifier_copyData_generic(md, target); - if (tmcmd->cache_file) { - id_us_plus(&tmcmd->cache_file->id); - } tmcmd->reader = NULL; } |