[Bf-blender-cvs] [849f5bee193] blender-v2.83-release: Cleanup: ID makelocal code: remove useless and confusing debug code.

Bastien Montagne noreply at git.blender.org
Mon May 25 15:41:05 CEST 2020


Commit: 849f5bee193e4d1c98b99a8e40da56a7af5a8fc8
Author: Bastien Montagne
Date:   Mon May 25 15:38:36 2020 +0200
Branches: blender-v2.83-release
https://developer.blender.org/rB849f5bee193e4d1c98b99a8e40da56a7af5a8fc8

Cleanup: ID makelocal code: remove useless and confusing debug code.

Thing is, user code should not have the responsibility to check that
libquery is valid. Such checks are only source of confusion and errors
as nobody will think about finding and updating them in some obscure
specific area of the code...

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

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

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

diff --git a/source/blender/blenkernel/intern/lib_id.c b/source/blender/blenkernel/intern/lib_id.c
index 9ef1785a753..b4513fc2805 100644
--- a/source/blender/blenkernel/intern/lib_id.c
+++ b/source/blender/blenkernel/intern/lib_id.c
@@ -1746,20 +1746,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;
     }



More information about the Bf-blender-cvs mailing list