Commit: d50587d2257776094fcf69d7aacbe4de66247fc5 Author: Bastien Montagne Date: Tue Feb 11 18:01:43 2020 +0100 Branches: undo-experiments https://developer.blender.org/rBd50587d2257776094fcf69d7aacbe4de66247fc5
undoexp: Update for 'unique ID memaddress' change. =================================================================== M source/blender/blenloader/intern/readfile.c =================================================================== diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 5afd0dbb18d..37b41189c1d 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -9155,6 +9155,12 @@ static BHead *read_libblock(FileData *fd, *r_id = id_old; } + const bool is_id_memaddress_already_registered = !BKE_main_idmemset_register_id(main, + id_old); + /* Should never fail, since we re-used an existing ID it should have already been + * registered. */ + BLI_assert(!is_id_memaddress_already_registered); + MEM_freeN(id); oldnewmap_free_unused(fd->datamap); oldnewmap_clear(fd->datamap); _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs