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:
authorBastien Montagne <b.mont29@gmail.com>2020-02-07 12:58:18 +0300
committerBastien Montagne <b.mont29@gmail.com>2020-02-07 12:58:18 +0300
commit753323af15d7d8986efbdc4ad8d81331ddeee470 (patch)
tree7f971b5a87b1aa0af778ae2b1bc4d04e0505d3d3 /source/blender/blenloader
parent192314b9d37f92b6ca8b7e72bd4c5105776416ea (diff)
Fix crash when linking.
Stupid mistake in yesterday's own refactoring of readfile code...
Diffstat (limited to 'source/blender/blenloader')
-rw-r--r--source/blender/blenloader/intern/readfile.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index c1a39711bf8..9547e4cd05a 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -10194,14 +10194,14 @@ static void expand_id_private_id(FileData *fd, Main *mainvar, ID *id)
/* Handle 'private IDs'. */
bNodeTree *nodetree = ntreeFromID(id);
if (nodetree != NULL) {
- expand_id(fd, mainvar, id);
+ expand_id(fd, mainvar, &nodetree->id);
expand_nodetree(fd, mainvar, nodetree);
}
if (GS(id->name) == ID_SCE) {
Scene *scene = (Scene *)id;
if (scene->master_collection != NULL) {
- expand_id(fd, mainvar, id);
+ expand_id(fd, mainvar, &scene->master_collection->id);
expand_collection(fd, mainvar, scene->master_collection);
}
}