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:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2012-12-03 20:21:43 +0400
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2012-12-03 20:21:43 +0400
commit81a762e79f8391942026f8c8614fe5c364b85168 (patch)
treec9674dead7904d468cfb648fcea16d2b94d18a8f /source/blender/blenloader
parent458131e3957d14d7440acd7fe12a0e381fbf936f (diff)
Fix cycles viewport render getting stuck with driven/animated nodes, the updated
flag would not get cleared due to the nodetree not being a real datablock.
Diffstat (limited to 'source/blender/blenloader')
-rw-r--r--source/blender/blenloader/intern/readfile.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 375b1cf47a2..2c3d3f631bd 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -2409,6 +2409,8 @@ static void direct_link_nodetree(FileData *fd, bNodeTree *ntree)
ntree->adt = newdataadr(fd, ntree->adt);
direct_link_animdata(fd, ntree->adt);
+ ntree->id.flag &= ~(LIB_ID_RECALC|LIB_ID_RECALC_DATA);
+
link_list(fd, &ntree->nodes);
for (node = ntree->nodes.first; node; node = node->next) {
node->typeinfo = NULL;