Merge branch 'blender-v2.83-release'

Conflicts:
	source/blender/blenkernel/intern/lib_id.c

1 files changed, 1 insertions, 15 deletions

diff --git a/source/blender/blenkernel/intern/lib_id.c b/source/blender/blenkernel/intern/lib_id.c
index ba5a169b4ee..19462c62496 100644
--- a/source/blender/blenkernel/intern/lib_id.c
+++ b/source/blender/blenkernel/intern/lib_id.c
@@ -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;
     }