blender
/
blender
136
406
Fork 589
Code Issues 6.2k Pull Requests 758 Projects 19 Wiki Activity

Merge branch 'blender-v3.0-release'

This commit is contained in:
Bastien Montagne 2021-11-04 17:27:51 +01:00
parent a72b26527d 2eed1afd11
commit 2373ce7fcf
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source/blender/modifiers/intern/MOD_cloth.c
View File

@ -201,13 +201,9 @@ static void copyData(const ModifierData *md, ModifierData *target, const int fla
tclmd->point_cache = clmd->point_cache;
}
else {
tclmd->point_cache = BKE_ptcache_add(&tclmd->ptcaches);
if (clmd->point_cache != NULL) {
tclmd->point_cache->step = clmd->point_cache->step;
tclmd->point_cache->startframe = clmd->point_cache->startframe;
tclmd->point_cache->endframe = clmd->point_cache->endframe;
tclmd->point_cache->flag |= (clmd->point_cache->flag & PTCACHE_FLAGS_COPY);
}
const int clmd_point_cache_index = BLI_findindex(&clmd->ptcaches, clmd->point_cache);
BKE_ptcache_copy_list(&tclmd->ptcaches, &clmd->ptcaches, flag);
tclmd->point_cache = BLI_findlink(&tclmd->ptcaches, clmd_point_cache_index);
}
tclmd->sim_parms = MEM_dupallocN(clmd->sim_parms);