[Bf-blender-cvs] [a4cc256b257] undo-experiments-swap-reread-datablocks: Merge branch 'undo-experiments' into undo-experiments-swap-reread-datablocks

[Bastien Montagne]

Commit: a4cc256b257710eadb6bd66f7fd3e21b59586f64
Author: Bastien Montagne
Date:   Fri Feb 21 17:20:06 2020 +0100
Branches: undo-experiments-swap-reread-datablocks
https://developer.blender.org/rBa4cc256b257710eadb6bd66f7fd3e21b59586f64

Merge branch 'undo-experiments' into undo-experiments-swap-reread-datablocks

Conflicts:
	source/blender/blenloader/intern/readfile.c

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



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

diff --cc source/blender/blenloader/intern/readfile.c
index 1ab2081e594,bb4432de595..8a1c7187643
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@@ -9212,13 -9205,6 +9228,14 @@@ static BHead *read_libblock(FileData *f
    id->newid = NULL; /* Needed because .blend may have been saved with crap value here... */
    id->orig_id = NULL;
  
 +  if (do_id_swap) {
-     const bool is_id_memaddress_already_registered = !BKE_main_idmemset_register_id(main, id_old);
++    const bool is_id_memaddress_already_registered = !BKE_main_idmemhash_register_id(
++        main, NULL, 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);
 +  }
 +
    /* this case cannot be direct_linked: it's just the ID part */
    if (id_bhead->code == ID_LINK_PLACEHOLDER) {
      /* That way, we know which data-lock needs do_versions (required currently for linking). */