[Bf-blender-cvs] [c4a4d20d3dd] master: Fix part of T53080: all material previews re-rendering after undo.

Brecht Van Lommel noreply at git.blender.org
Fri Jan 26 10:16:05 CET 2018


Commit: c4a4d20d3ddc9e1791fca89f76f14b0ee94b827b
Author: Brecht Van Lommel
Date:   Fri Jan 26 07:54:09 2018 +0100
Branches: master
https://developer.blender.org/rBc4a4d20d3ddc9e1791fca89f76f14b0ee94b827b

Fix part of T53080: all material previews re-rendering after undo.

This reverts commit dc2617130b2e1d7d2b9892fbd7c6e7b60caafb66, which disabled
writing of previews for undo. While this uses some memory, re-rendering all
previews is very expensive, especially if for example you have lots of materials
using high-res image textures.

===================================================================

M	source/blender/blenloader/intern/writefile.c

===================================================================

diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c
index d7d2dd529f9..c2820ac6e30 100644
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@ -679,8 +679,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 */



More information about the Bf-blender-cvs mailing list