[Bf-blender-cvs] [4010b17d474] temp-T94185-id-remapper-ui: Fix assert logic.

[Jeroen Bakker]

Commit: 4010b17d474e7d953f5532e7f218e8d23354b192
Author: Jeroen Bakker
Date:   Tue Jan 25 10:45:49 2022 +0100
Branches: temp-T94185-id-remapper-ui
https://developer.blender.org/rB4010b17d474e7d953f5532e7f218e8d23354b192

Fix assert logic.

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

M	source/blender/blenkernel/intern/lib_id_remapper.cc
M	source/blender/blenkernel/intern/lib_id_remapper_test.cc

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

diff --git a/source/blender/blenkernel/intern/lib_id_remapper.cc b/source/blender/blenkernel/intern/lib_id_remapper.cc
index 4bb6f44612c..c1734c9826a 100644
--- a/source/blender/blenkernel/intern/lib_id_remapper.cc
+++ b/source/blender/blenkernel/intern/lib_id_remapper.cc
@@ -49,7 +49,7 @@ struct IDRemapper {
   void add(ID *old_id, ID *new_id)
   {
     BLI_assert(old_id != nullptr);
-    BLI_assert(new_id != nullptr && GS(old_id) == GS(new_id));
+    BLI_assert(new_id == nullptr || (GS(old_id->name) == GS(new_id->name)));
     mappings.add(old_id, new_id);
     source_types |= BKE_idtype_idcode_to_idfilter(GS(old_id->name));
   }
diff --git a/source/blender/blenkernel/intern/lib_id_remapper_test.cc b/source/blender/blenkernel/intern/lib_id_remapper_test.cc
index 5ac0bbdd341..594f64dac73 100644
--- a/source/blender/blenkernel/intern/lib_id_remapper_test.cc
+++ b/source/blender/blenkernel/intern/lib_id_remapper_test.cc
@@ -20,6 +20,8 @@
 
 #include "BKE_lib_remap.h"
 
+#include "BLI_string.h"
+
 #include "DNA_ID.h"
 
 namespace blender::bke::id::remapper::tests {
@@ -52,6 +54,8 @@ TEST(lib_id_remapper, mapped)
   ID id1;
   ID id2;
   ID *idp = &id1;
+  BLI_strncpy(id1.name, "OB1", sizeof(id1.name));
+  BLI_strncpy(id2.name, "OB2", sizeof(id2.name));
 
   IDRemapper *remapper = BKE_id_remapper_create();
   BKE_id_remapper_add(remapper, &id1, &id2);