diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-12-18 18:05:54 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-12-18 18:05:54 +0400 |
| commit | 2a657345c7d68f98b3e8e27fbcd4f9995de077e4 (patch) | |
| tree | effddaa265ad94d6f68457e029847fc571fc39e7 /source/blender | |
| parent | 9c90cf3ca4a5b1181865c5d5e3eb27a87ee2781c (diff) | |
Fix #33600: copying objects with point caches did not copy the external,
disk cache and lib path settings.
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/blenkernel/intern/pointcache.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/pointcache.c b/source/blender/blenkernel/intern/pointcache.c index 965a1e2b4a6..2eadfe73858 100644 --- a/source/blender/blenkernel/intern/pointcache.c +++ b/source/blender/blenkernel/intern/pointcache.c @@ -2782,7 +2782,8 @@ static PointCache *ptcache_copy(PointCache *cache, int copy_data) ncache->mem_cache.last = NULL; ncache->cached_frames = NULL; - ncache->flag= 0; + /* flag is a mix of user settings and simulator/baking state */ + ncache->flag= ncache->flag & (PTCACHE_DISK_CACHE|PTCACHE_EXTERNAL|PTCACHE_IGNORE_LIBPATH); ncache->simframe= 0; } else { |