[Bf-blender-cvs] [3d083f376b9] blender2.8: Fix T56255: Crash w/ collection access from Python
Campbell Barton
noreply at git.blender.org
Tue Aug 7 04:46:35 CEST 2018
Commit: 3d083f376b9c75f868c9687946549acd18d91959
Author: Campbell Barton
Date: Tue Aug 7 12:45:01 2018 +1000
Branches: blender2.8
https://developer.blender.org/rB3d083f376b9c75f868c9687946549acd18d91959
Fix T56255: Crash w/ collection access from Python
===================================================================
M source/blender/blenloader/intern/readfile.c
===================================================================
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) */
More information about the Bf-blender-cvs
mailing list