[Bf-blender-cvs] [48418ec1254] master: Revert "Fix assert unlinking text"

[Bastien Montagne]

Commit: 48418ec125413be95cecbb71599b714d258c3daf
Author: Bastien Montagne
Date:   Fri Jul 19 11:10:53 2019 +0200
Branches: master
https://developer.blender.org/rB48418ec125413be95cecbb71599b714d258c3daf

Revert "Fix assert unlinking text"

This reverts commit b0b2546d4a3a308da19d218d919915aac4834e59.

Please do not sweept the dirt under the carpet like that! If there is a
bug, either report it or fix it, but do not silence it!

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

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 796010205e7..8fe2552c03f 100644
--- a/source/blender/blenkernel/intern/library_remap.c
+++ b/source/blender/blenkernel/intern/library_remap.c
@@ -1144,8 +1144,7 @@ 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
-          /* Text always has a single user, skip assert in this case. */
-          BLI_assert((id->us == 0) || ELEM(GS(id->name), ID_TXT));
+          BLI_assert(id->us == 0);
         }
         BKE_id_free_ex(bmain, id, free_flag, !do_tagged_deletion);
       }