[Bf-blender-cvs] [534573f6b9d] master: Fix T60957: ASSERT when reloading double-linked file.

Bastien Montagne noreply at git.blender.org
Wed Jan 30 11:50:18 CET 2019


Commit: 534573f6b9dc5e637bea18de3edcd0f22593666a
Author: Bastien Montagne
Date:   Wed Jan 30 11:46:49 2019 +0100
Branches: master
https://developer.blender.org/rB534573f6b9dc5e637bea18de3edcd0f22593666a

Fix T60957: ASSERT when reloading double-linked file.

Kind of funny to see that this has been missing presumably since the
first version of library linking in Blender, and only gets noticed now.
Then again, that was not really a critical issue, iirc write code
ensures all libraries directly used get properly written, even if flags
are incorrect.

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

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

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

diff --git a/source/blender/blenkernel/intern/library.c b/source/blender/blenkernel/intern/library.c
index a933bd939e8..1db36b459fe 100644
--- a/source/blender/blenkernel/intern/library.c
+++ b/source/blender/blenkernel/intern/library.c
@@ -168,6 +168,7 @@ void id_lib_extern(ID *id)
 		if (id->tag & LIB_TAG_INDIRECT) {
 			id->tag &= ~LIB_TAG_INDIRECT;
 			id->tag |= LIB_TAG_EXTERN;
+			id->lib->parent = NULL;
 		}
 	}
 }



More information about the Bf-blender-cvs mailing list