[Bf-blender-cvs] [1180b4ff4a7] blender-v2.93-release: Fix T89516: Crash on append

Julian Eisel noreply at git.blender.org
Thu Nov 4 09:43:14 CET 2021


Commit: 1180b4ff4a7adad1c68aa950c5da8967f31e51c6
Author: Julian Eisel
Date:   Mon Jun 28 19:28:59 2021 +0200
Branches: blender-v2.93-release
https://developer.blender.org/rB1180b4ff4a7adad1c68aa950c5da8967f31e51c6

Fix T89516: Crash on append

Caused by 37458798fa02, was doing a NULL-pointer dereference because it used
the wrong pointer to check if the data-block is linked.

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

M	source/blender/blenkernel/intern/lib_id.c

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

diff --git a/source/blender/blenkernel/intern/lib_id.c b/source/blender/blenkernel/intern/lib_id.c
index eeda77771ed..5beaf8b1eed 100644
--- a/source/blender/blenkernel/intern/lib_id.c
+++ b/source/blender/blenkernel/intern/lib_id.c
@@ -1917,7 +1917,7 @@ void BKE_library_make_local(Main *bmain,
         ntree->tag &= ~LIB_TAG_DOIT;
       }
 
-      if (!ID_IS_LINKED(id->lib)) {
+      if (!ID_IS_LINKED(id)) {
         id->tag &= ~(LIB_TAG_EXTERN | LIB_TAG_INDIRECT | LIB_TAG_NEW);
         id->flag &= ~LIB_INDIRECT_WEAK_LINK;
         if (ID_IS_OVERRIDE_LIBRARY_REAL(id) &&



More information about the Bf-blender-cvs mailing list