From 4d0d1b5936c59b6e7ce5b3ae8b1af617cbdada61 Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Mon, 17 Apr 2017 22:33:07 +0200 Subject: Fix T51150: user_remap on itself changes users to 0. Remapping to itself is nonsense here (was triggering an assert in BKE_library code actually), just make it a bail out early in RNA callback in that case. --- source/blender/makesrna/intern/rna_ID.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/blender/makesrna/intern/rna_ID.c b/source/blender/makesrna/intern/rna_ID.c index 6ed2c55138c..a74758a4f71 100644 --- a/source/blender/makesrna/intern/rna_ID.c +++ b/source/blender/makesrna/intern/rna_ID.c @@ -342,7 +342,7 @@ static void rna_ID_user_clear(ID *id) static void rna_ID_user_remap(ID *id, Main *bmain, ID *new_id) { - if (GS(id->name) == GS(new_id->name)) { + if ((GS(id->name) == GS(new_id->name)) && (id != new_id)) { /* For now, do not allow remapping data in linked data from here... */ BKE_libblock_remap(bmain, id, new_id, ID_REMAP_SKIP_INDIRECT_USAGE | ID_REMAP_SKIP_NEVER_NULL_USAGE); } -- cgit v1.2.3