Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2018-03-12 12:49:07 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2018-03-12 12:58:12 +0300
commit815852e9503e27f98cd17f589e1a29af2319f936 (patch)
tree2d25fd517733bf0a4cae462b5c561dda0b8c2734 /source/blender/blenloader/intern
parentda62507bc8f00f6cd443b450d973114c762b16fc (diff)
Fix T54296: Cycles viewport render stuck on constant re-render
Need Clear ID recalc flag on load. Otherwise it's possible to have some IDs considered always updated by Cycles, when they were saved in a tagged-for-update state. Thanks Bastien for feedback and review!
Diffstat (limited to 'source/blender/blenloader/intern')
-rw-r--r--source/blender/blenloader/intern/readfile.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index d6868e67fc7..e1059a50412 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -8241,6 +8241,7 @@ static BHead *read_libblock(FileData *fd, Main *main, BHead *bhead, const short
id->us = ID_FAKE_USERS(id);
id->icon_id = 0;
id->newid = NULL; /* Needed because .blend may have been saved with crap value here... */
+ id->recalc = 0;
/* this case cannot be direct_linked: it's just the ID part */
if (bhead->code == ID_ID) {