[Bf-blender-cvs] [56ebc769a6d] lanpr-under-gp: LANPR: Fix readfile.c node tree linking error from merge.

YimingWu noreply at git.blender.org
Mon Jun 8 06:11:45 CEST 2020


Commit: 56ebc769a6d5fcb2d6ccd2803aba0e0c0bc62066
Author: YimingWu
Date:   Mon Jun 8 12:11:38 2020 +0800
Branches: lanpr-under-gp
https://developer.blender.org/rB56ebc769a6d5fcb2d6ccd2803aba0e0c0bc62066

LANPR: Fix readfile.c node tree linking error from merge.

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

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

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

diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 9c82a05f390..2c2dbfec0f8 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -6668,8 +6668,6 @@ static void lib_link_scene(FileData *fd, Main *UNUSED(bmain), Scene *sce)
   }
 
   if (sce->nodetree) {
-    lib_link_ntree(fd, &sce->id, sce->nodetree);
-    sce->nodetree->id.lib = sce->id.lib;
     composite_patch(sce->nodetree, sce);
   }



More information about the Bf-blender-cvs mailing list