[Bf-blender-cvs] [541fb672ec4] temp-lanpr-review: Always write LANPR data if set

Julian Eisel noreply at git.blender.org
Wed Nov 27 17:21:42 CET 2019


Commit: 541fb672ec4a280f48d087c60269ef3e9da2f33f
Author: Julian Eisel
Date:   Wed Nov 27 17:19:41 2019 +0100
Branches: temp-lanpr-review
https://developer.blender.org/rB541fb672ec4a280f48d087c60269ef3e9da2f33f

Always write LANPR data if set

Gerneral rule of thumb: Don't delete user data without permission.
Data-blocks are a whole different and difficult story. Users may have
disabled just for a render, reloading the file shouldn't make their
settings go lost.

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

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

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

diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c
index ce5e7078e2d..bae90d1dce5 100644
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@ -2384,7 +2384,7 @@ static void write_collection_nolib(WriteData *wd, Collection *collection)
     writestruct(wd, DATA, CollectionChild, 1, child);
   }
 
-  if ((collection->flag & COLLECTION_CONFIGURED_FOR_LANPR) && (collection->lanpr != NULL)) {
+  if (collection->lanpr != NULL) {
     writestruct(wd, DATA, CollectionLANPR, 1, collection->lanpr);
   }
 }



More information about the Bf-blender-cvs mailing list