blender
/
blender
136
406
Fork 590
Code Issues 6.2k Pull Requests 760 Projects 19 Wiki Activity

Merge branch 'blender-v2.83-release' 

Conflicts:
	source/blender/blenkernel/intern/lib_id.c
This commit is contained in:
Bastien Montagne 2020-05-25 15:43:54 +02:00
parent b01d2ea72a 849f5bee19
commit 8b849f39e8
1 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
source/blender/blenkernel/intern/lib_id.c
View File

@ -343,7 +343,7 @@ static int lib_id_expand_local_cb(LibraryIDLinkCallbackData *cb_data)
*/
void BKE_lib_id_expand_local(Main *bmain, ID *id)
{
BKE_library_foreach_ID_link(bmain, id, lib_id_expand_local_cb, NULL, IDWALK_READONLY);
BKE_library_foreach_ID_link(bmain, id, lib_id_expand_local_cb, bmain, IDWALK_READONLY);
}
/**
@ -1691,20 +1691,6 @@ static void library_make_local_copying_check(ID *id,
/* Our oh-so-beloved 'from' pointers... Those should always be ignored here, since the actual
* relation we want to check is in the other way around. */
if (entry->usage_flag & IDWALK_CB_LOOPBACK) {
#ifndef NDEBUG
/* Some debug checks to ensure we explicitly are aware of all 'loop-back' cases, since those
* may not always be manageable in the same way... */
switch (GS(par_id->name)) {
case ID_OB:
BLI_assert(((Object *)par_id)->proxy_from == (Object *)id);
break;
case ID_KE:
BLI_assert(((Key *)par_id)->from == id);
break;
default:
BLI_assert(0);
}
#endif
continue;
}