[Bf-blender-cvs] [753323af15d] master: Fix crash when linking.

Bastien Montagne noreply at git.blender.org
Fri Feb 7 10:59:00 CET 2020


Commit: 753323af15d7d8986efbdc4ad8d81331ddeee470
Author: Bastien Montagne
Date:   Fri Feb 7 10:58:18 2020 +0100
Branches: master
https://developer.blender.org/rB753323af15d7d8986efbdc4ad8d81331ddeee470

Fix crash when linking.

Stupid mistake in yesterday's own refactoring of readfile code...

===================================================================

M	source/blender/blenloader/intern/readfile.c

===================================================================

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);
     }
   }



More information about the Bf-blender-cvs mailing list