[Bf-blender-cvs] [ac6d8241fbb] master: Fix: Override Test Cases Failing With Asserts.
Jeroen Bakker
noreply at git.blender.org
Mon Mar 29 11:51:36 CEST 2021
Commit: ac6d8241fbbec0c4bc0f5932ab8d3c7f832d103d
Author: Jeroen Bakker
Date: Mon Mar 29 11:50:48 2021 +0200
Branches: master
https://developer.blender.org/rBac6d8241fbbec0c4bc0f5932ab8d3c7f832d103d
Fix: Override Test Cases Failing With Asserts.
===================================================================
M source/blender/blenkernel/intern/lib_override.c
===================================================================
diff --git a/source/blender/blenkernel/intern/lib_override.c b/source/blender/blenkernel/intern/lib_override.c
index dbb46aa5780..ebe8043d41d 100644
--- a/source/blender/blenkernel/intern/lib_override.c
+++ b/source/blender/blenkernel/intern/lib_override.c
@@ -118,7 +118,7 @@ IDOverrideLibrary *BKE_lib_override_library_init(ID *local_id, ID *reference_id)
/** Shalow or deep copy of a whole override from \a src_id to \a dst_id. */
void BKE_lib_override_library_copy(ID *dst_id, const ID *src_id, const bool do_full_copy)
{
- BLI_assert(ID_IS_OVERRIDE_LIBRARY(src_id));
+ BLI_assert(ID_IS_OVERRIDE_LIBRARY(src_id) || ID_IS_OVERRIDE_LIBRARY_TEMPLATE(src_id));
if (dst_id->override_library != NULL) {
if (src_id->override_library == NULL) {
More information about the Bf-blender-cvs
mailing list