[Bf-blender-cvs] [b0b2546d4a3] master: Fix assert unlinking text

Campbell Barton noreply at git.blender.org
Tue Jul 16 09:29:53 CEST 2019


Commit: b0b2546d4a3a308da19d218d919915aac4834e59
Author: Campbell Barton
Date:   Tue Jul 16 17:27:53 2019 +1000
Branches: master
https://developer.blender.org/rBb0b2546d4a3a308da19d218d919915aac4834e59

Fix assert unlinking text

Interferes with debugging.

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

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

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

diff --git a/source/blender/blenkernel/intern/library_remap.c b/source/blender/blenkernel/intern/library_remap.c
index 8fe2552c03f..796010205e7 100644
--- a/source/blender/blenkernel/intern/library_remap.c
+++ b/source/blender/blenkernel/intern/library_remap.c
@@ -1144,7 +1144,8 @@ static void id_delete(Main *bmain, const bool do_tagged_deletion)
 #ifdef DEBUG_PRINT
           printf("%s: deleting %s (%d)\n", __func__, id->name, id->us);
 #endif
-          BLI_assert(id->us == 0);
+          /* Text always has a single user, skip assert in this case. */
+          BLI_assert((id->us == 0) || ELEM(GS(id->name), ID_TXT));
         }
         BKE_id_free_ex(bmain, id, free_flag, !do_tagged_deletion);
       }



More information about the Bf-blender-cvs mailing list