[Bf-blender-cvs] [6f4dbb661f1] master: Revert "Writefile: Cleanup Scene runtime data."

Brecht Van Lommel noreply at git.blender.org
Fri Apr 3 02:26:04 CEST 2020


Commit: 6f4dbb661f104d7bc487765c618b023b3862e33d
Author: Brecht Van Lommel
Date:   Fri Apr 3 02:24:14 2020 +0200
Branches: master
https://developer.blender.org/rB6f4dbb661f104d7bc487765c618b023b3862e33d

Revert "Writefile: Cleanup Scene runtime data."

This reverts commit ee0d91df5dd75029de6886db13e45af3d4c7ef7c. This is
modifying scene data on write, which causes crashes. It can only do that
on a copy of the data.

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

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

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

diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c
index ea334f258a1..693c4f8cced 100644
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@ -2591,12 +2591,6 @@ static void write_lightcache(WriteData *wd, LightCache *cache)
 
 static void write_scene(WriteData *wd, Scene *sce, const void *id_address)
 {
-  /* Clean up, important in undo case to reduce false detection of changed datablocks. */
-  if (sce->ed) {
-    sce->ed->cache = NULL;
-    sce->ed->prefetch_job = NULL;
-  }
-
   /* write LibData */
   writestruct_at_address(wd, ID_SCE, Scene, 1, id_address, sce);
   write_iddata(wd, &sce->id);



More information about the Bf-blender-cvs mailing list