diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-12-13 17:07:42 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-12-13 17:07:42 +0300 |
commit | ec3d25803ec544c3b6cccee45f8e943ee46f28a6 (patch) | |
tree | b0a9ae84d23e3f014e4ca9a26db5f0cb22cfd7b4 /source/blender/blenloader | |
parent | 3d6cc77cbd8fc1dbd92d186486d038857e6eda62 (diff) | |
parent | 81f135677be419a505a38f5a23354690a75b678b (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenloader')
-rw-r--r-- | source/blender/blenloader/intern/readfile.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 6df5a505788..494c1d5110b 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -3217,7 +3217,7 @@ static void direct_link_nodetree(FileData *fd, bNodeTree *ntree) ntree->adt = newdataadr(fd, ntree->adt); direct_link_animdata(fd, ntree->adt); - ntree->id.tag &= ~(LIB_TAG_ID_RECALC|LIB_TAG_ID_RECALC_DATA); + ntree->id.tag &= ~LIB_TAG_ID_RECALC_ALL; link_list(fd, &ntree->nodes); for (node = ntree->nodes.first; node; node = node->next) { |