diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-01-28 07:18:33 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-01-28 07:18:33 +0300 |
commit | 88174bd22c8798fa5038a3b8d5192e052bfe673e (patch) | |
tree | 728c5654cf0fb879027b774d5b4bf964ffe543ec /source/blender/blenloader/intern/writefile.c | |
parent | 7aaede920fd1376fc06edd45c73403f2084a64bc (diff) | |
parent | 3c852ba0741f794a697f95073b04921e9ff94039 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenloader/intern/writefile.c')
-rw-r--r-- | source/blender/blenloader/intern/writefile.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c index f0d479e1d71..78719949afe 100644 --- a/source/blender/blenloader/intern/writefile.c +++ b/source/blender/blenloader/intern/writefile.c @@ -708,8 +708,10 @@ static void write_iddata(void *wd, const ID *id) static void write_previews(WriteData *wd, const PreviewImage *prv_orig) { - /* Never write previews when doing memsave (i.e. undo/redo)! */ - if (prv_orig && !wd->current) { + /* Note we write previews also for undo steps. It takes up some memory, + * but not doing so would causes all previews to be re-rendered after + * undo which is too expensive. */ + if (prv_orig) { PreviewImage prv = *prv_orig; /* don't write out large previews if not requested */ |