[Bf-blender-cvs] [989d510e3e2] master: Cleanup: remove some temp dev asserts in new link/append code.

Bastien Montagne noreply at git.blender.org
Mon Dec 6 11:38:50 CET 2021


Commit: 989d510e3e25ec0fc42147613ee224bdc3831077
Author: Bastien Montagne
Date:   Mon Dec 6 11:28:31 2021 +0100
Branches: master
https://developer.blender.org/rB989d510e3e25ec0fc42147613ee224bdc3831077

Cleanup: remove some temp dev asserts in new link/append code.

No longer needed now that all code uses that new
BKE_blendfile_link_append module, and that instantiation code in
BLO_readfile has been removed.

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

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

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

diff --git a/source/blender/blenkernel/intern/blendfile_link_append.c b/source/blender/blenkernel/intern/blendfile_link_append.c
index 7c06613f437..6cb71c48a00 100644
--- a/source/blender/blenkernel/intern/blendfile_link_append.c
+++ b/source/blender/blenkernel/intern/blendfile_link_append.c
@@ -1056,12 +1056,6 @@ void BKE_blendfile_append(BlendfileLinkAppendContext *lapp_context, ReportList *
     }
     BLI_assert(item->userdata == NULL);
 
-    /* Linked IDs should never be marked as needing post-processing (instantiation of loose
-     * objects etc.).
-     * NOTE: This is a developer test check, can be removed once we get rid of instantiation code
-     * in BLO completely.*/
-    BLI_assert((id->tag & LIB_TAG_DOIT) == 0);
-
     ID *existing_local_id = BKE_idtype_idcode_append_is_reusable(GS(id->name)) ?
                                 BKE_main_library_weak_reference_search_item(
                                     lapp_context->library_weak_reference_mapping,
@@ -1381,12 +1375,6 @@ void BKE_blendfile_link(BlendfileLinkAppendContext *lapp_context, ReportList *re
       }
       BLI_assert(item->userdata == NULL);
 
-      /* Linked IDs should never be marked as needing post-processing (instantiation of loose
-       * objects etc.).
-       * NOTE: This is developer test check, can be removed once we get rid of instantiation code
-       * in BLO completely.*/
-      BLI_assert((id->tag & LIB_TAG_DOIT) == 0);
-
       BlendfileLinkAppendContextCallBack cb_data = {
           .lapp_context = lapp_context, .item = item, .reports = reports};
       BKE_library_foreach_ID_link(lapp_context->params->bmain,



More information about the Bf-blender-cvs mailing list