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:
authorCampbell Barton <ideasman42@gmail.com>2018-08-07 05:45:01 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-08-07 05:45:01 +0300
commit3d083f376b9c75f868c9687946549acd18d91959 (patch)
treedfb0c9cc6ba1ef03eedc729f245290ad7a0ca236
parentfaf43ff9ad8e55fc2d80daf1523454c816e327b4 (diff)
Fix T56255: Crash w/ collection access from Python
-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 293114c4b79..b7aeee491c5 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -6495,6 +6495,8 @@ static void direct_link_scene(FileData *fd, Scene *sce)
if (sce->master_collection) {
sce->master_collection = newdataadr(fd, sce->master_collection);
direct_link_collection(fd, sce->master_collection);
+ /* Needed because this is an ID outside of Main. */
+ sce->master_collection->id.py_instance = NULL;
}
/* insert into global old-new map for reading without UI (link_global accesses it again) */